Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

initial move of config resources to fcrepo-configs module

test resources left as is
POMs edited to include necessary test resources from fcrepo-configs
fcrepo-webapp POM modified to include fcrepo-configs as a remote resource bundle, packaging configs into the regular classes directory under WEB-INF
fixed the auth-war build, such that it runs by default and does not interfere with other builds.
  • Loading branch information...
commit d3e02a42ca7030ebb753711199fc12be8a4999aa 1 parent c1bb4d1
Gregory Jansen authored
Showing with 156 additions and 152 deletions.
  1. +6 −0 fcrepo-auth-common/pom.xml
  2. 0  fcrepo-auth-common/src/{main → test}/resources/config/basic-authn/repository.json
  3. +6 −0 fcrepo-auth-oauth/pom.xml
  4. +6 −0 fcrepo-auth-roles-basic/pom.xml
  5. +6 −0 fcrepo-auth-roles-common/pom.xml
  6. +32 −0 fcrepo-configs/pom.xml
  7. 0  {fcrepo-jms → fcrepo-configs}/src/main/resources/config/activemq.xml
  8. 0  {fcrepo-http-commons → fcrepo-configs}/src/main/resources/config/clustered/repository.json
  9. 0  {fcrepo-kernel → fcrepo-configs}/src/main/resources/config/infinispan/clustered/infinispan.xml
  10. 0  {fcrepo-kernel → fcrepo-configs}/src/main/resources/config/infinispan/file/infinispan.xml
  11. 0  {fcrepo-kernel → fcrepo-configs}/src/main/resources/config/infinispan/leveldb-default/infinispan.xml
  12. 0  {fcrepo-kernel → fcrepo-configs}/src/main/resources/config/infinispan/leveldb/infinispan.xml
  13. 0  {fcrepo-kernel → fcrepo-configs}/src/main/resources/config/infinispan/ram/infinispan.xml
  14. 0  {fcrepo-http-commons → fcrepo-configs}/src/main/resources/config/jgroups-fcrepo-tcp.xml
  15. 0  {fcrepo-http-commons → fcrepo-configs}/src/main/resources/config/minimal-default/repository.json
  16. 0  {fcrepo-http-commons → fcrepo-configs}/src/main/resources/config/minimal/repository.json
  17. 0  {fcrepo-http-commons → fcrepo-configs}/src/main/resources/config/servlet-auth/repository.json
  18. +7 −0 fcrepo-generator-dc/pom.xml
  19. +6 −0 fcrepo-http-api/pom.xml
  20. +7 −0 fcrepo-http-commons/pom.xml
  21. +6 −0 fcrepo-kernel/pom.xml
  22. +6 −0 fcrepo-storage-policy/pom.xml
  23. +7 −0 fcrepo-transform/pom.xml
  24. +49 −17 fcrepo-webapp/pom.xml
  25. +1 −1  fcrepo-webapp/src/auth/{resources → webapp/WEB-INF/classes}/spring/auth-repo.xml
  26. +0 −134 fcrepo-webapp/src/main/resources/config/activemq.xml
  27. +6 −0 fcrepo-webhooks/pom.xml
  28. +5 −0 pom.xml
6 fcrepo-auth-common/pom.xml
View
@@ -76,6 +76,12 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server</artifactId>
0  ...main/resources/config/basic-authn/repository.json → ...test/resources/config/basic-authn/repository.json
View
File renamed without changes
6 fcrepo-auth-oauth/pom.xml
View
@@ -67,6 +67,12 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fcrepo</groupId>
<artifactId>fcrepo-http-commons</artifactId>
<version>${project.version}</version>
<scope>test</scope>
6 fcrepo-auth-roles-basic/pom.xml
View
@@ -56,6 +56,12 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- This dependency ensures that the AbstractRolesIT framework is available -->
<dependency>
<groupId>org.fcrepo</groupId>
6 fcrepo-auth-roles-common/pom.xml
View
@@ -71,6 +71,12 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
32 fcrepo-configs/pom.xml
View
@@ -0,0 +1,32 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo</artifactId>
+ <version>4.0.0-alpha-4-SNAPSHOT</version>
+ </parent>
+ <artifactId>fcrepo-configs</artifactId>
+ <name>Fedora Repository Configurations Module</name>
+ <description>The Fedora Commons repository configurations module: Provides configuration resources that are used in
+ integration testing and deployments.</description>
+ <build>
+ <plugins>
+ <!-- Turn this into a lifecycle -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
0  fcrepo-jms/src/main/resources/config/activemq.xml → ...po-configs/src/main/resources/config/activemq.xml
View
File renamed without changes
0  ...c/main/resources/config/clustered/repository.json → ...c/main/resources/config/clustered/repository.json
View
File renamed without changes
0  ...ources/config/infinispan/clustered/infinispan.xml → ...ources/config/infinispan/clustered/infinispan.xml
View
File renamed without changes
0  ...n/resources/config/infinispan/file/infinispan.xml → ...n/resources/config/infinispan/file/infinispan.xml
View
File renamed without changes
0  .../config/infinispan/leveldb-default/infinispan.xml → .../config/infinispan/leveldb-default/infinispan.xml
View
File renamed without changes
0  ...esources/config/infinispan/leveldb/infinispan.xml → ...esources/config/infinispan/leveldb/infinispan.xml
View
File renamed without changes
0  ...in/resources/config/infinispan/ram/infinispan.xml → ...in/resources/config/infinispan/ram/infinispan.xml
View
File renamed without changes
0  .../src/main/resources/config/jgroups-fcrepo-tcp.xml → .../src/main/resources/config/jgroups-fcrepo-tcp.xml
View
File renamed without changes
0  .../resources/config/minimal-default/repository.json → .../resources/config/minimal-default/repository.json
View
File renamed without changes
0  ...src/main/resources/config/minimal/repository.json → ...src/main/resources/config/minimal/repository.json
View
File renamed without changes
0  ...ain/resources/config/servlet-auth/repository.json → ...ain/resources/config/servlet-auth/repository.json
View
File renamed without changes
7 fcrepo-generator-dc/pom.xml
View
@@ -53,6 +53,13 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+
+ <dependency>
+ <groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-http-commons</artifactId>
6 fcrepo-http-api/pom.xml
View
@@ -63,6 +63,12 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fcrepo</groupId>
<artifactId>fcrepo-http-commons</artifactId>
<version>${project.version}</version>
<scope>test</scope>
7 fcrepo-http-commons/pom.xml
View
@@ -80,6 +80,13 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
6 fcrepo-kernel/pom.xml
View
@@ -79,6 +79,12 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
6 fcrepo-storage-policy/pom.xml
View
@@ -65,6 +65,12 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server</artifactId>
7 fcrepo-transform/pom.xml
View
@@ -93,6 +93,13 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+
+ <dependency>
+ <groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
66 fcrepo-webapp/pom.xml
View
@@ -64,6 +64,12 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fcrepo</groupId>
<artifactId>fcrepo-transform</artifactId>
<version>${project.version}</version>
</dependency>
@@ -140,11 +146,34 @@
</dependency>
</dependencies>
-
<build>
-
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/maven-shared-archive-resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-remote-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.fcrepo:fcrepo-configs:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<attachClasses>true</attachClasses>
@@ -385,25 +414,28 @@
</profile>
<profile>
<id>auth-war</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>spring/repo.xml</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/auth/resources</directory>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <configuration>
- <classifier>auth</classifier>
- <packagingExcludes>WEB-INF/classes/spring/repo.xml</packagingExcludes>
- </configuration>
+ <executions>
+ <execution>
+ <id>special-auth-war</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <classifier>auth</classifier>
+ <warSourceDirectory>src/main/webapp</warSourceDirectory>
+ <warSourceDirectory>src/auth/webapp</warSourceDirectory>
+ <packagingExcludes>WEB-INF/classes/spring/repo.xml</packagingExcludes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
2  ...po-webapp/src/auth/resources/spring/auth-repo.xml → .../auth/webapp/WEB-INF/classes/spring/auth-repo.xml
View
@@ -19,7 +19,7 @@
<bean name="pep" class="org.fcrepo.auth.roles.basic.BasicRolesPEP"/>
<bean name="authenticationProvider" class="org.fcrepo.auth.common.ServletContainerAuthenticationProvider">
- <property name="pep" ref="pep"/>
+ <property name="pep" ref="pep"/>
</bean>
<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
134 fcrepo-webapp/src/main/resources/config/activemq.xml
View
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- 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-3.0.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
- <context:property-placeholder/>
-
- <!--
- The <broker> element is used to configure the ActiveMQ broker.
- -->
- <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost">
-
- <!--
- For better performances use VM cursor and small memory limit.
- For more information, see:
-
- http://activemq.apache.org/message-cursors.html
-
- Also, if your producer is "hanging", it's probably due to producer flow control.
- For more information, see:
- http://activemq.apache.org/producer-flow-control.html
- -->
-
- <destinationPolicy>
- <policyMap>
- <policyEntries>
- <policyEntry topic=">" producerFlowControl="true">
- <!-- The constantPendingMessageLimitStrategy is used to prevent
- slow topic consumers to block producers and affect other consumers
- by limiting the number of messages that are retained
- For more information, see:
-
- http://activemq.apache.org/slow-consumer-handling.html
-
- -->
- <pendingMessageLimitStrategy>
- <constantPendingMessageLimitStrategy limit="1000"/>
- </pendingMessageLimitStrategy>
- </policyEntry>
- <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb">
- <!-- Use VM cursor for better latency
- For more information, see:
-
- http://activemq.apache.org/message-cursors.html
-
- <pendingQueuePolicy>
- <vmQueueCursor/>
- </pendingQueuePolicy>
- -->
- </policyEntry>
- </policyEntries>
- </policyMap>
- </destinationPolicy>
-
-
- <!--
- The managementContext is used to configure how ActiveMQ is exposed in
- JMX. By default, ActiveMQ uses the MBean server that is started by
- the JVM. For more information, see:
-
- http://activemq.apache.org/jmx.html
- -->
- <managementContext>
- <managementContext createConnector="false"/>
- </managementContext>
-
- <!--
- Configure message persistence for the broker. The default persistence
- mechanism is the KahaDB store (identified by the kahaDB tag).
- For more information, see:
-
- http://activemq.apache.org/persistence.html
- -->
- <persistenceAdapter>
- <kahaDB directory="${fcrepo.activemq.dir:ActiveMQ/kahadb}"/>
- </persistenceAdapter>
-
-
- <!--
- The systemUsage controls the maximum amount of space the broker will
- use before slowing down producers. For more information, see:
- http://activemq.apache.org/producer-flow-control.html
- If using ActiveMQ embedded - the following limits could safely be used:
- -->
-
- <systemUsage>
- <systemUsage>
- <memoryUsage>
- <memoryUsage limit="20 mb"/>
- </memoryUsage>
- <storeUsage>
- <storeUsage limit="1 gb"/>
- </storeUsage>
- <tempUsage>
- <tempUsage limit="100 mb"/>
- </tempUsage>
- </systemUsage>
- </systemUsage>
-
-
- <!--
- The transport connectors expose ActiveMQ over a given protocol to
- clients and other brokers. For more information, see:
-
- http://activemq.apache.org/configuring-transports.html
- -->
- <transportConnectors>
- <!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB -->
- <transportConnector name="openwire"
- uri="tcp://0.0.0.0:${jms.port:61616}?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600"
- />
- <transportConnector name="stomp" uri="stomp://0.0.0.0:${stomp.port:61613}"/>
- </transportConnectors>
-
- <!-- destroy the spring context on shutdown to stop jetty -->
- <shutdownHooks>
- <bean xmlns="http://www.springframework.org/schema/beans"
- class="org.apache.activemq.hooks.SpringContextHook"/>
- </shutdownHooks>
-
- </broker>
-
- <!--
- Enable web consoles, REST and Ajax APIs and demos
-
- Take a look at ${ACTIVEMQ_HOME}/conf/jetty.xml for more details
-
- <import resource="jetty.xml"/>
- -->
-</beans>
6 fcrepo-webhooks/pom.xml
View
@@ -62,6 +62,12 @@ See: http://en.wikipedia.org/wiki/Webhook</description>
<type>test-jar</type>
</dependency>
<dependency>
+ <groupId>org.fcrepo</groupId>
+ <artifactId>fcrepo-configs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
5 pom.xml
View
@@ -75,6 +75,7 @@
<module>fcrepo-auth-roles-basic</module>
<module>fcrepo-kernel-api</module>
<module>fcrepo-connector-file</module>
+ <module>fcrepo-configs</module>
</modules>
<dependencyManagement>
<dependencies>
@@ -672,6 +673,10 @@
<version>2.6</version>
</plugin>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<configuration>
Please sign in to comment.
Something went wrong with that request. Please try again.