testing with 3.8.0 RC1

fedora/client/bin/env-client.bat

@@ -41,4 +41,4 @@ set OPTS=%OPTS% -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jax
 set OPTS=%OPTS% -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
 set OPTS=%OPTS% -Dfedora.home="%FEDORA_HOME%"
 
-%JAVA% -Xms64m -Xmx96m -cp %CP% %OPTS% %*
+%JAVA% -Xms64m -Xmx96m -cp %CP% %OPTS% %*

fedora/client/bin/fedora-admin.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\client\bin\env-client.bat"
 
-call %LAUNCHER% org.fcrepo.client.Administrator %*
+call %LAUNCHER% org.fcrepo.client.Administrator %*

fedora/client/bin/fedora-batch-build.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\client\bin\env-client.bat"
 
-call %LAUNCHER% org.fcrepo.client.batch.AutoBatchBuild %*
+call %LAUNCHER% org.fcrepo.client.batch.AutoBatchBuild %*

fedora/client/bin/fedora-batch-build.sh

@@ -5,4 +5,4 @@ scriptdir=`dirname "$0"`
 
 execWithCmdlineArgs org.fcrepo.client.batch.AutoBatchBuild
 
-exit $?
+exit $?

fedora/client/bin/fedora-batch-buildingest.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\client\bin\env-client.bat"
 
-call %LAUNCHER% org.fcrepo.client.batch.AutoBatchBuildIngest %*
+call %LAUNCHER% org.fcrepo.client.batch.AutoBatchBuildIngest %*

fedora/client/bin/fedora-batch-ingest.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\client\bin\env-client.bat"
 
-call %LAUNCHER% org.fcrepo.client.batch.AutoBatchIngest %*
+call %LAUNCHER% org.fcrepo.client.batch.AutoBatchIngest %*

fedora/client/bin/fedora-batch-ingest.sh

@@ -5,4 +5,4 @@ scriptdir=`dirname "$0"`
 
 execWithCmdlineArgs org.fcrepo.client.batch.AutoBatchIngest
 
-exit $?
+exit $?

fedora/client/bin/fedora-dsinfo.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\client\bin\env-client.bat"
 
-call %LAUNCHER% org.fcrepo.client.datastream.DatastreamConduit %*
+call %LAUNCHER% org.fcrepo.client.datastream.DatastreamConduit %*

fedora/client/bin/fedora-export.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\client\bin\env-client.bat"
 
-call %LAUNCHER% org.fcrepo.client.utility.export.Export %*
+call %LAUNCHER% org.fcrepo.client.utility.export.Export %*

fedora/client/bin/fedora-find.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\client\bin\env-client.bat"
 
-call %LAUNCHER% org.fcrepo.client.utility.AutoFinder %*
+call %LAUNCHER% org.fcrepo.client.utility.AutoFinder %*

fedora/client/bin/fedora-ingest-demos.bat

@@ -13,7 +13,7 @@ echo ERROR: Not enough arguments.
 echo Usage:
 echo   fedora-ingest-demos host port user password protocol [context]
 echo Example:
-echo   fedora-ingest-demos localhost 8080 fedoraAdmin fedoraAdmin http my-fedora
+echo   fedora-ingest-demos localhost 8983 fedoraAdmin fedoraAdmin http my-fedora
 exit /B 1
 :enoughArgs
 
@@ -25,4 +25,4 @@ set ARGS=%ARGS% %DEMO_PATH%
 set ARGS=%ARGS% %DEMO_FORMAT%
 set ARGS=%ARGS% "%1:%2" %3 %4 %5 "" %6
 
-call %LAUNCHER% org.fcrepo.client.utility.ingest.Ingest %ARGS%
+call %LAUNCHER% org.fcrepo.client.utility.ingest.Ingest %ARGS%

fedora/client/bin/fedora-ingest-demos.sh

@@ -8,7 +8,7 @@ if [ $# -lt 5 ]; then
 	echo "Usage:"
 	echo "  fedora-ingest-demos host port user password protocol [context]"
 	echo "Example:"
-	echo "  fedora-ingest-demos localhost 8080 fedoraAdmin fedoraAdmin http my-fedora"
+	echo "  fedora-ingest-demos localhost 8983 fedoraAdmin fedoraAdmin http my-fedora"
 	exit 1
 fi
 

fedora/client/bin/fedora-ingest.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\client\bin\env-client.bat"
 
-call %LAUNCHER% org.fcrepo.client.utility.ingest.Ingest %*
+call %LAUNCHER% org.fcrepo.client.utility.ingest.Ingest %*

fedora/client/bin/fedora-ingest.sh

@@ -5,4 +5,4 @@ scriptdir=`dirname "$0"`
 
 execWithCmdlineArgs org.fcrepo.client.utility.ingest.Ingest
 
-exit $?
+exit $?

fedora/client/bin/fedora-massingest.sh

@@ -5,4 +5,4 @@ scriptdir=`dirname "$0"`
 
 execWithCmdlineArgs org.fcrepo.client.test.MassIngest
 
-exit $?
+exit $?

fedora/client/bin/fedora-modify.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\client\bin\env-client.bat"
 
-call %LAUNCHER% org.fcrepo.client.batch.AutoModify %*
+call %LAUNCHER% org.fcrepo.client.batch.AutoModify %*

fedora/client/bin/fedora-purge.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\client\bin\env-client.bat"
 
-call %LAUNCHER% org.fcrepo.client.utility.AutoPurger %*
+call %LAUNCHER% org.fcrepo.client.utility.AutoPurger %*

fedora/client/bin/fedora-purge.sh

@@ -5,4 +5,4 @@ scriptdir=`dirname "$0"`
 
 execWithCmdlineArgs org.fcrepo.client.utility.AutoPurger
 
-exit $?
+exit $?

fedora/client/bin/fedora-validate-objects.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\client\bin\env-client.bat"
 
-call %LAUNCHER% org.fcrepo.client.utility.validate.process.ValidatorProcess %*
+call %LAUNCHER% org.fcrepo.client.utility.validate.process.ValidatorProcess %*

fedora/client/demo/soapclient/run-demo-soapclient.bat

@@ -52,4 +52,4 @@ echo ERROR: java was found in %THIS_JAVA_HOME%, but it was not version 1.4
 echo Make sure FEDORA_JAVA_HOME or JAVA_HOME points to a 1.4JRE/JDK base.
 goto end
 
-:end
+:end

fedora/default/docs/license/license.html

@@ -58,7 +58,7 @@
 <body>
 <div id="header">
     <h1>Fedora Commons&trade; License</h1>
-    <h2>Fedora Repository 3.7.0</h2>
+    <h2>Fedora Repository 3.8.0-SNAPSHOT</h2>
 </div>
 
 <ol id="content">

fedora/default/install/install.properties

@@ -1,5 +1,5 @@
 #Install Options
-#Thu Sep 19 16:33:04 EDT 2013
+#Fri Aug 15 12:40:32 EDT 2014
 ri.enabled=false
 messaging.enabled=false
 apia.auth.required=false
@@ -12,6 +12,7 @@ database.username=fedoraAdmin
 fesl.authz.enabled=false
 deploy.local.services=true
 xacml.enabled=false
+tomcat.http.port=8983
 fedora.serverHost=localhost
 database=included
 database.driver=included

fedora/default/server/access/Fedora-API-A-LITE.wsdl

@@ -293,7 +293,7 @@
 				</p>
 				<p> A complete example URL conforming to this syntax is:</p>
 				<p>
-					<i>http://localhost:8080/fedora/describe?xml=true</i>
+					<i>http://localhost:8983/fedora/describe?xml=true</i>
 				</p>
 			</documentation>
 			<input message="fedora-api:describeRepositoryRequest"/>
@@ -367,15 +367,15 @@
 				</p>
 				<p> A couple complete example URLs conforming to this syntax, are:</p>
 				<p>
-					<i>http://localhost:8080/fedora/search?terms=fedora&amp;pid=true</i>
+					<i>http://localhost:8983/fedora/search?terms=fedora&amp;pid=true</i>
 				</p>
 				<dir>
 This example requests that the server provide the pids of objects where any of the indexed fields contain the word fedora.
 Since maxResults and xml aren't specified, the maxResults the server uses will be a small number, and the result will
 be provided in html.
 </dir>
 				<p>
-					<i>http://localhost:8080/fedora/search?query=pid~*1&amp;maxResults=50&amp;xml=true&amp;pid=true&amp;creator=true</i>
+					<i>http://localhost:8983/fedora/search?query=pid~*1&amp;maxResults=50&amp;xml=true&amp;pid=true&amp;creator=true</i>
 				</p>
 				<dir>
 This example requests that the server provide the pids and dc:creators of objects where the pid ends with the number 1.
@@ -634,7 +634,7 @@ It asks for up to 50 results at a time from the server, and requests that the re
 	</binding>
 	<service name="Fedora-API-A-LITE">
 		<port name="Fedora-API-A-LITE-Port" binding="fedora-api:Fedora-API-A-LITE-Binding">
-			<http:address location="http://localhost:8080/fedora/"/>
+			<http:address location="http://localhost:8983/fedora/"/>
 		</port>
 		<port name="Fedora-API-A-LITE-Port-SSL" binding="fedora-api:Fedora-API-A-LITE-Binding">
 			<http:address location="https://localhost:8443/fedora/"/>

fedora/default/server/access/Fedora-API-A-MTOM.wsdl

@@ -205,11 +205,11 @@
 
   <service name="Fedora-API-A-MTOM-Service">
     <port name="Fedora-API-A-MTOM-Port-SOAPHTTP" binding="fedora-api:Fedora-API-A-MTOM-Binding-SOAPHTTP">
-      <soap:address location="http://localhost:8080/fedora/services/accessMTOM"/>
+      <soap:address location="http://localhost:8983/fedora/services/accessMTOM"/>
     </port>
     <port name="Fedora-API-A-MTOM-Port-SOAPHTTPS" binding="fedora-api:Fedora-API-A-MTOM-Binding-SOAPHTTP">
       <soap:address location="https://localhost:8443/fedora/services/accessMTOM"/>
     </port>
   </service>
 
-</definitions>
+</definitions>

fedora/default/server/access/Fedora-API-A.wsdl

@@ -205,7 +205,7 @@
 
   <service name="Fedora-API-A-Service">
     <port name="Fedora-API-A-Port-SOAPHTTP" binding="fedora-api:Fedora-API-A-Binding-SOAPHTTP">
-      <soap:address location="http://localhost:8080/fedora/services/access"/>
+      <soap:address location="http://localhost:8983/fedora/services/access"/>
     </port>
     <port name="Fedora-API-A-Port-SOAPHTTPS" binding="fedora-api:Fedora-API-A-Binding-SOAPHTTP">
       <soap:address location="https://localhost:8443/fedora/services/access"/>

fedora/default/server/bin/env-server.bat

@@ -65,4 +65,4 @@ set OPTS=%OPTS% -Dcom.sun.xacml.PolicySchema="%FEDORA_HOME%\server\xsd\cs-xacml-
 set OPTS=%OPTS% -Dfedora.home="%FEDORA_HOME%"
 set OPTS=%OPTS% -Dfedora.web.inf.lib="%WEBINF%\lib%"
 
-%JAVA% -server -Xmn64m -Xms256m -Xmx256m -cp %CP% %OPTS% %*
+%JAVA% -server -Xmn64m -Xms256m -Xmx256m -cp %CP% %OPTS% %*

fedora/default/server/bin/fedora-modify-control-group.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\server\bin\env-server.bat"
 
-call %LAUNCHER% org.fcrepo.server.utilities.ServerUtility migrateDatastreamControlGroup %*
+call %LAUNCHER% org.fcrepo.server.utilities.ServerUtility migrateDatastreamControlGroup %*

fedora/default/server/bin/fedora-rebuild.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\server\bin\env-server.bat"
 
-call %LAUNCHER% org.fcrepo.server.utilities.rebuild.Rebuild %*
+call %LAUNCHER% org.fcrepo.server.utilities.rebuild.Rebuild %*

fedora/default/server/bin/fedora-reload-policies.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\server\bin\env-server.bat"
 
-call %LAUNCHER% org.fcrepo.server.utilities.ServerUtility reloadPolicies %*
+call %LAUNCHER% org.fcrepo.server.utilities.ServerUtility reloadPolicies %*

fedora/default/server/bin/validate-policy.bat

@@ -8,4 +8,4 @@ exit /B 1
 
 set LAUNCHER="%FEDORA_HOME%\server\bin\env-server.bat"
 
-call %LAUNCHER% org.fcrepo.server.security.PolicyParser %*
+call %LAUNCHER% org.fcrepo.server.security.PolicyParser %*

fedora/default/server/config/fedora.fcfg

@@ -21,7 +21,7 @@ https://wiki.duraspace.org/display/FEDORA36/Spring+Security
   <param name="datastreamExtensionMappingSource" value="mime-to-extensions.xml">
     <comment>Source of mappings from MIMETYPE to file extension</comment>
   </param>
-  <param name="fedoraServerPort" value="8080">
+  <param name="fedoraServerPort" value="8983">
     <comment>Defines the port number on which the Fedora server runs; 
 		default is 8080.</comment>
   </param>
@@ -142,7 +142,7 @@ https://wiki.duraspace.org/display/FEDORA36/Spring+Security
     <param name="POLICY-SCHEMA-PATH" value="xsd/cs-xacml-schema-policy-01.xsd"/>
     <param name="ENFORCE-MODE" value="permit-all-requests"/>
     <param name="VALIDATE-OBJECT-POLICIES-FROM-DATASTREAM" value="false"/>
-    <param name="XACML-COMBINING-ALGORITHM" value="com.sun.xacml.combine.OrderedDenyOverridesPolicyAlg"/>
+    <param name="XACML-COMBINING-ALGORITHM" value="org.jboss.security.xacml.sunxacml.combine.OrderedDenyOverridesPolicyAlg"/>
     <param name="VALIDATE-OBJECT-POLICIES-FROM-FILE" value="false"/>
     <param name="VALIDATE-REPOSITORY-POLICIES" value="true"/>
     <param name="REPOSITORY-POLICIES-DIRECTORY" value="data/fedora-xacml-policies/repository-policies" isFilePath="true"/>
@@ -205,7 +205,7 @@ https://wiki.duraspace.org/display/FEDORA36/Spring+Security
             your own FedoraStorageHintProvider and drop your implementation to the $CATALINA_HOME/webapps/fedora/WEB_INF/classes
             directory (unpackaged), or the $CATALINA_HOME/webapps/fedora/WEB_INF/lib director (packaged).</comment>
     </param>
-    <param name="gSearchRESTURL" value="http://localhost:8080/fedoragsearch/rest">
+    <param name="gSearchRESTURL" value="http://localhost:8983/fedoragsearch/rest">
       <comment>The REST endpoint of the Fedora Generic Search service.
             This parameter is only required if GSearchDOManager is 
             used.</comment>
@@ -222,37 +222,6 @@ https://wiki.duraspace.org/display/FEDORA36/Spring+Security
 	    	characters, and may only contain A-Z, a-z, 0-9, &apos;.&apos;, or &apos;-&apos; (dash).</comment>
     </param>
   </module>
-  <module role="org.fcrepo.server.management.Management" class="org.fcrepo.server.management.ManagementModule">
-    <comment>The management subsystem. This implements the methods necessary 
-		to fulfill API-M requests without regard to:
-                 - how the service is exposed
-                 - how bytestreams and java types might be marshalled/demarshalled over the wire
-                 - how the storage subsystem is implemented.</comment>
-    <param name="purgeDelayInMillis" value="60000">
-      <comment>Optional, default is 60000 (1 minute).
-            This specifies the amount of time between checks to remove
-            temporary files uploaded via the API-M upload interface.  During
-            each check, old files whose age exceeds uploadStorageMinutes
-            will be removed.</comment>
-    </param>
-    <param name="decorator1" value="org.fcrepo.server.messaging.NotificationInvocationHandler"/>
-    <param name="checksumAlgorithm" value="MD5">
-      <comment>Specifies which checksumming algorithm is to be used when 
-			automatically computing checksums as specified by the above 
-			parameter. Valid values are: MD5  SHA-1  SHA-256  SHA-384  SHA-512.</comment>
-    </param>
-    <param name="uploadStorageMinutes" value="5">
-      <comment>Optional, default is 5.
-            This specifies the minimum amount of time that each uploaded
-            file should be kept in temporary storage.</comment>
-    </param>
-    <param name="autoChecksum" value="false">
-      <comment>Controls whether a checksum is automatically computed for 
-			every datastream as the datastream is added to the repository. This 
-			will allow the integrity of datastream contents to be periodically 
-			checked to insure the object is not corrupted.</comment>
-    </param>
-  </module>
   <module role="org.fcrepo.server.access.Access" class="org.fcrepo.server.access.DefaultAccess">
     <comment>Description: The access subsystem. This implements the methods 
     	necessary to fulfill API-A requests without regard to:
@@ -521,6 +490,36 @@ https://wiki.duraspace.org/display/FEDORA36/Spring+Security
   <module role="org.fcrepo.server.storage.ExternalContentManager" class="org.fcrepo.server.storage.DefaultExternalContentManager">
     <comment>This module facilitates obtaining external content via HTTP</comment>
   </module>
+  <module role="org.fcrepo.server.management.Management" class="org.fcrepo.server.management.ManagementModule">
+    <comment>The management subsystem. This implements the methods necessary 
+		to fulfill API-M requests without regard to:
+                 - how the service is exposed
+                 - how bytestreams and java types might be marshalled/demarshalled over the wire
+                 - how the storage subsystem is implemented.</comment>
+    <param name="purgeDelayInMillis" value="60000">
+      <comment>Optional, default is 60000 (1 minute).
+            This specifies the amount of time between checks to remove
+            temporary files uploaded via the API-M upload interface.  During
+            each check, old files whose age exceeds uploadStorageMinutes
+            will be removed.</comment>
+    </param>
+    <param name="checksumAlgorithm" value="MD5">
+      <comment>Specifies which checksumming algorithm is to be used when 
+			automatically computing checksums as specified by the above 
+			parameter. Valid values are: MD5  SHA-1  SHA-256  SHA-384  SHA-512.</comment>
+    </param>
+    <param name="autoChecksum" value="false">
+      <comment>Controls whether a checksum is automatically computed for 
+			every datastream as the datastream is added to the repository. This 
+			will allow the integrity of datastream contents to be periodically 
+			checked to insure the object is not corrupted.</comment>
+    </param>
+    <param name="uploadStorageMinutes" value="5">
+      <comment>Optional, default is 5.
+            This specifies the minimum amount of time that each uploaded
+            file should be kept in temporary storage.</comment>
+    </param>
+  </module>
   <datastore id="localMySQLPool">
     <comment>MySQL database on localhost with db name of fedora3. Each
              connection pool instance has several configuration parameter that

fedora/default/server/config/spring/README.txt

@@ -1,4 +1,4 @@
-Fedora 3.7.0 Spring Configuration
+Fedora 3.8.0-SNAPSHOT Spring Configuration
 ==== Notes ====================
 Fedora will attempt to parse all files with a .xml extension in this directory
 as Spring bean definitions.  The application context for these definitions

fedora/default/server/config/spring/fesl/web/config-attribute-finder.xml

@@ -147,11 +147,6 @@
         </map>
       </property>
     </bean>
-    <bean id="org.fcrepo.server.security.ContextAttributeFinderModule"
-        class="org.fcrepo.server.security.ContextAttributeFinderModule"
-        autowire-candidate="true">
-      <constructor-arg><ref bean="org.fcrepo.server.security.ContextRegistry" /></constructor-arg>
-    </bean>
 
 	<!--
 	<AttributeFinder name="org.fcrepo.server.security.xacml.pdp.finder.attribute.LDAPAttributeFinder">

fedora/default/server/config/spring/fesl/web/config-melcoe-pep.xml

@@ -81,7 +81,6 @@
               class="org.fcrepo.server.security.xacml.pep.impl.FESLPolicyEnforcementPoint"
               autowire-candidate="true" init-method="init">
               <constructor-arg><ref bean="MelcoePDPConfig" /></constructor-arg>
-              <constructor-arg><ref bean="org.fcrepo.server.security.ContextRegistry" /></constructor-arg>
         </bean>
         <bean id="org.fcrepo.server.security.Authorization"
               class="org.fcrepo.server.security.xacml.pep.impl.FESLAuthorization"