Latest Fedora

.gitignore

@@ -3,26 +3,10 @@ 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

README.md

@@ -9,19 +9,14 @@ This is a copy of jetty with the needed applications for running Hydra.  These i
 
 * jetty: 8.1.10.v20130312
 * solr: 4.9.0
-* fedora: 3.7.1
+* fedora: 4.0.0b2
 
 ## 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
@@ -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.xml

@@ -2,9 +2,5 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 <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="war"><SystemProperty name="jetty.home" default="."/>/webapps/fcrepo-webapp-4.0.0-beta-04-SNAPSHOT.war</Set>
 </Configure>