Permalink
Browse files

Consolidate spring configuration

  • Loading branch information...
whikloj authored and awoods committed Feb 10, 2017
1 parent 41b0b26 commit b00873e7d47ecf9f266e3628fcb9270e35edcc9c
@@ -10,9 +10,6 @@
<logger name="org.fcrepo.auth" additivity="false" level="${fcrepo.log.auth:-null}">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.fcrepo.connector.file" additivity="false" level="${fcrepo.log.connector.file:-null}">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.fcrepo.http.api" additivity="false" level="${fcrepo.log.http.api:-null}">
<appender-ref ref="STDOUT"/>
</logger>
@@ -25,9 +22,6 @@
<logger name="org.fcrepo.kernel" additivity="false" level="${fcrepo.log.kernel:-null}">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.fcrepo.transform" additivity="false" level="${fcrepo.log.transform:-null}">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.fcrepo" additivity="false" level="${fcrepo.log:-INFO}">
<appender-ref ref="STDOUT"/>
</logger>

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1,104 @@
<?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:task="http://www.springframework.org/schema/task"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:c="http://www.springframework.org/schema/c"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
<!-- Master context for fcrepo4. -->
<!-- Context that supports the actual ModeShape JCR itself -->
<context:property-placeholder/>
<context:annotation-config/>
<context:component-scan base-package="org.fcrepo"/>
<!-- **********************************
MODESHAPE configuration
********************************** -->
<!-- Authentication Not Enabled -->
<bean name="modeshapeRepofactory"
class="org.fcrepo.kernel.modeshape.spring.ModeShapeRepositoryFactoryBean"
p:repositoryConfiguration="${fcrepo.modeshape.configuration}" />
<!-- Identifier translation chain -->
<util:list id="translationChain" value-type="org.fcrepo.kernel.api.identifiers.InternalIdentifierConverter">
<bean class="org.fcrepo.kernel.modeshape.identifiers.HashConverter"/>
<bean class="org.fcrepo.kernel.modeshape.identifiers.NamespaceConverter"/>
</util:list>
<!-- *************************************
JMS/Eventing Configuration
************************************* -->
<!-- publishes events from the internal bus to a JMS Topic or Queue.
"constructor-arg" for both is topic/queue name. -->
<!-- JMS Topic -->
<bean class="org.fcrepo.jms.JMSTopicPublisher">
<constructor-arg value="fedora"/>
</bean>
<!-- JMS Queue -->
<!--
<bean class="org.fcrepo.jms.JMSQueuePublisher">
<constructor-arg value="fedora"/>
</bean>
-->
<!-- ActiveMQ connection -->
<bean id="connectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory" depends-on="jmsBroker"
p:brokerURL="vm://${fcrepo.jms.host:localhost}:${fcrepo.dynamic.jms.port:61616}?create=false"/>
<!-- JMS Broker configuration -->
<bean name="jmsBroker" class="org.apache.activemq.xbean.BrokerFactoryBean"
p:config="${fcrepo.activemq.configuration:classpath:/config/activemq.xml}" p:start="true"/>
<!-- translates events into JMS header-only format-->
<bean class="org.fcrepo.jms.DefaultMessageFactory"/>
<!-- listener that moves JCR Events to the Fedora internal event bus -->
<bean class="org.fcrepo.kernel.modeshape.observer.SimpleObserver"/>
<!-- used by bean above to filter which events get put on the bus -->
<bean name="fedoraEventFilter" class="org.fcrepo.kernel.modeshape.observer.DefaultFilter"/>
<!-- used by observer bean to map JCR events into Fedora events -->
<bean name="fedoraEventMapper" class="org.fcrepo.kernel.modeshape.observer.eventmappings.AllNodeEventsOneEvent"/>
<!-- Fedora's lightweight internal event bus. Currently memory-resident.-->
<bean name="fedoraInternalEventBus" class="com.google.common.eventbus.EventBus"/>
<!-- ***********************************
Internal system configuration
*********************************** -->
<task:scheduler id="taskScheduler" />
<task:executor id="taskExecutor" pool-size="1" />
<task:annotation-driven executor="taskExecutor" scheduler="taskScheduler" />
<!-- Start the Modeshape JCR -->
<bean class="org.modeshape.jcr.ModeShapeEngine" init-method="start"/>
<!-- For the time being, load annotation config here too -->
<bean class="org.fcrepo.metrics.MetricsConfig"/>
<bean id="connectionManager" class="org.apache.http.impl.conn.PoolingHttpClientConnectionManager" />
<!-- Generates HTTP Sessions -->
<bean class="org.fcrepo.http.commons.session.SessionFactory"/>
</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.
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<!-- Master context for fcrepo4. -->
<import resource="${fcrepo.spring.configuration:classpath:/spring/fcrepo-config.xml}"/>
</beans>

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -5,11 +5,11 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<display-name>Fedora 4</display-name>
<display-name>Fedora Repository</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/classes/spring/master.xml</param-value>
<param-value>WEB-INF/classes/spring/repository.xml</param-value>
</context-param>
<listener>

0 comments on commit b00873e

Please sign in to comment.