Merge branch 'fedora-4/master'

Fedora4 support and other fixes to the hydra-jetty application

.gitignore

@@ -3,26 +3,11 @@ solr/data/*
 solr/*/data/*
 
 # Fedora dev instance data
-fedora/default/data
-fedora/default/derby/*
-fedora/default/server/logs/*
-fedora/default/server/management/upload/*
-fedora/default/server/status
-
-# Fedora test instance data
-fedora/test/data
-fedora/test/derby/*
-fedora/test/server/logs/*
-fedora/test/server/management/upload/*
-fedora/test/server/status
-
-fedora/default/server/fedora-internal-use/fedora-internal-use-backend-service-policies/
-fedora/default/server/fedora-internal-use/has-started.txt
-
-fedora/test/server/fedora-internal-use/fedora-internal-use-backend-service-policies/
-fedora/test/server/fedora-internal-use/has-started.txt
+fcrepo4-data
 
 # Logs
 logs/*
 derby.log
 jettywrapper.log
+velocity.log*
+*.log

README.md

@@ -7,26 +7,21 @@ This is a copy of jetty with the needed applications for running Hydra.  These i
 
 ## Included Versions
 
-* jetty: 8.1.10.v20130312
+* jetty: 8.1.16
 * solr: 4.9.0
-* fedora: 3.7.1
+* fedora: 4.0.0
 
 ## Usage
 
 ### Dependencies
 
 * [Java 7 (JRE)](https://java.com/en/download/index.jsp)
 
-#### Java 6
-
-Java 6 is unsupported under Solr 4.9, but still supported under Fedora 3.7.1.  However, hydra-jetty has only been tested under
-Java 7 so it is recommended to use Java 7 and not Java 6.
-
 ### Manual
 
     git clone https://github.com/projecthydra/hydra-jetty
     cd hydra-jetty
-    java -Xmx256m -XX:MaxPermSize=256m -jar start.jar
+    java -Xmx512m -XX:MaxPermSize=512m -jar start.jar
 
 You can also change the port jetty starts on by editing the file etc/jetty.xml and changing this line to indicate a different port number:
 
@@ -48,14 +43,10 @@ When jetty is finished initializing itself, Solr is available at
 
 * [http://localhost:8983/solr/](http://localhost:8983/solr/)
 
-Fedora is available in two copies, one for developement
+and Fedora is available at
 
 * [http://localhost:8983/fedora/](http://localhost:8983/fedora/)
 
-and an additional copy for testing:
-
-* [http://localhost:8983/fedora-test/](http://localhost:8983/fedora-test/)
-
 You can see a list of all installed applications at
 
 * [http://localhost:8983](http://localhost:8983)

contexts/fedora-test.xml → contexts/dashboard.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
-  <Set name="contextPath">/fedora-test</Set>
-  <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/fedora.war</Set>
-  <Call name="setInitParameter">
-    <Arg>fedora.home</Arg>
-    <Arg><SystemProperty name="jetty.home" default="."/>/fedora/test</Arg>
-  </Call>
+  <Set name="contextPath">/</Set>
+  <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/dashboard</Set>
 </Configure>

contexts/fedora.xml

@@ -3,8 +3,5 @@
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath">/fedora</Set>
   <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/fedora.war</Set>
-  <Call name="setInitParameter">
-    <Arg>fedora.home</Arg>
-    <Arg><SystemProperty name="jetty.home" default="."/>/fedora/default</Arg>
-  </Call>
+  <Set name="overrideDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/fedora-override-web.xml</Set>
 </Configure>

contexts/solr-jetty-context.xml → contexts/solr.xml

@@ -3,5 +3,4 @@
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath"><SystemProperty name="hostContext" default="/solr"/></Set>
   <Set name="war"><SystemProperty name="jetty.home"/>/webapps/solr.war</Set>
-  <Set name="defaultsDescriptor"><SystemProperty name="jetty.home"/>/etc/webdefault.xml</Set>
 </Configure>

etc/fedora-override-web.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  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>
+
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>WEB-INF/classes/spring/master.xml</param-value>
+  </context-param>
+
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+
+  <servlet>
+    <servlet-name>jersey-servlet</servlet-name>
+    <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+
+    <init-param>
+      <param-name>javax.ws.rs.Application</param-name>
+      <param-value>org.fcrepo.http.commons.FedoraApplication</param-value>
+    </init-param>
+
+    <load-on-startup>1</load-on-startup>
+    <async-supported>true</async-supported>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>jersey-servlet</servlet-name>
+    <url-pattern>/rest/*</url-pattern>
+
+  </servlet-mapping>
+
+  <!--Uncomment section below to enable Basic-Authentication-->
+  <!--
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Fedora4</web-resource-name>
+      <url-pattern>/*</url-pattern>
+      <http-method>DELETE</http-method>
+      <http-method>PUT</http-method>
+      <http-method>HEAD</http-method>
+      <http-method>OPTIONS</http-method>
+      <http-method>PATCH</http-method>
+      <http-method>GET</http-method>
+      <http-method>POST</http-method>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>fedoraUser</role-name>
+      <role-name>fedoraAdmin</role-name>
+    </auth-constraint>
+    <user-data-constraint>
+      <transport-guarantee>NONE</transport-guarantee>
+    </user-data-constraint>
+  </security-constraint>
+
+  <login-config>
+    <auth-method>BASIC</auth-method>
+    <realm-name>fcrepo</realm-name>
+  </login-config>
+  -->
+
+
+</web-app>