diff --git a/fedorarepo-client/fedorarepo-admin-client/pom.xml b/fcrepo-client/fcrepo-admin-client/pom.xml similarity index 94% rename from fedorarepo-client/fedorarepo-admin-client/pom.xml rename to fcrepo-client/fcrepo-admin-client/pom.xml index 0098929b0..594ec6ee4 100644 --- a/fedorarepo-client/fedorarepo-admin-client/pom.xml +++ b/fcrepo-client/fcrepo-admin-client/pom.xml @@ -1,16 +1,16 @@ 4.0.0 - org.fedorarepo - fedorarepo-admin-client + org.fcrepo + fcrepo-admin-client jar 3.3-SNAPSHOT Fedora Admin Client http://duraspace.org - org.fedorarepo - fedorarepo + org.fcrepo + fcrepo 3.3-SNAPSHOT ../pom.xml @@ -152,8 +152,8 @@ lib.wsdl4j --> - org.fedorarepo - fedorarepo-server + org.fcrepo + fcrepo-server ${project.version} @@ -242,37 +242,37 @@ 1.3 - org.fedorarepo + org.fcrepo axis 1.3-PATCHED - org.fedorarepo + org.fcrepo jai_codec 1.1.2_01 - org.fedorarepo + org.fcrepo jai_core 1.1.2_01 - org.fedorarepo + org.fcrepo mulgara-core 2.1.1 - org.fedorarepo + org.fcrepo openrdf-sesame-onejar 2.2.1 - org.fedorarepo + org.fcrepo sunxacml 1.2-PATCHED - org.fedorarepo + org.fcrepo trippi-core 1.4.1 diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/APIAStubFactory.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/APIAStubFactory.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/APIAStubFactory.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/APIAStubFactory.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/APIMStubFactory.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/APIMStubFactory.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/APIMStubFactory.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/APIMStubFactory.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/Administrator.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/Administrator.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/Administrator.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/Administrator.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BasisDataStream.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BasisDataStream.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BasisDataStream.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BasisDataStream.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchBuildGUI.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchBuildGUI.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchBuildGUI.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchBuildGUI.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchBuildIngestGUI.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchBuildIngestGUI.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchBuildIngestGUI.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchBuildIngestGUI.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchIngestGUI.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchIngestGUI.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchIngestGUI.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchIngestGUI.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchOutput.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchOutput.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchOutput.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchOutput.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchOutputCatcher.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchOutputCatcher.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchOutputCatcher.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchOutputCatcher.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchThread.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchThread.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/BatchThread.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/BatchThread.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/DataStream.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/DataStream.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/DataStream.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/DataStream.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/DataStreamEditor.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/DataStreamEditor.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/DataStreamEditor.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/DataStreamEditor.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/DigitalObject.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/DigitalObject.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/DigitalObject.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/DigitalObject.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/Downloader.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/Downloader.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/Downloader.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/Downloader.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/FTypeDialog.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/FTypeDialog.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/FTypeDialog.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/FTypeDialog.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/FedoraClient.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/FedoraClient.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/FedoraClient.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/FedoraClient.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/HttpInputStream.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/HttpInputStream.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/HttpInputStream.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/HttpInputStream.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/InlineDataStream.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/InlineDataStream.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/InlineDataStream.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/InlineDataStream.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/LoginDialog.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/LoginDialog.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/LoginDialog.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/LoginDialog.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/NewObjectDialog.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/NewObjectDialog.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/NewObjectDialog.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/NewObjectDialog.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/ObjectFormatDialog.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/ObjectFormatDialog.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/ObjectFormatDialog.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/ObjectFormatDialog.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/SwingWorker.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/SwingWorker.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/SwingWorker.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/SwingWorker.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/Uploader.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/Uploader.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/Uploader.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/Uploader.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/WatchPrintStream.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/WatchPrintStream.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/WatchPrintStream.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/WatchPrintStream.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/ChangeObjectState.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/ChangeObjectState.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/ChangeObjectState.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/ChangeObjectState.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/ExportObject.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/ExportObject.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/ExportObject.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/ExportObject.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/Login.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/Login.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/Login.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/Login.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/PurgeObject.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/PurgeObject.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/PurgeObject.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/PurgeObject.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/ViewObject.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/ViewObject.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/ViewObject.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/ViewObject.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/ViewObjectXML.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/ViewObjectXML.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/actions/ViewObjectXML.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/actions/ViewObjectXML.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/AutoBatchBuild.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/AutoBatchBuild.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/AutoBatchBuild.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/AutoBatchBuild.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/AutoBatchBuildIngest.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/AutoBatchBuildIngest.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/AutoBatchBuildIngest.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/AutoBatchBuildIngest.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/AutoBatchIngest.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/AutoBatchIngest.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/AutoBatchIngest.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/AutoBatchIngest.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/AutoModify.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/AutoModify.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/AutoModify.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/AutoModify.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchAdditions.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchAdditions.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchAdditions.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchAdditions.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchIngest.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchIngest.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchIngest.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchIngest.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModify.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModify.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModify.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModify.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModifyParser.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModifyParser.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModifyParser.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModifyParser.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidate.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidate.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidate.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidate.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidator.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidator.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidator.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidator.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidatorErrorHandler.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidatorErrorHandler.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidatorErrorHandler.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModifyValidatorErrorHandler.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModifyXMLErrorHandler.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModifyXMLErrorHandler.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchModifyXMLErrorHandler.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchModifyXMLErrorHandler.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchTool.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchTool.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchTool.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchTool.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchXforms.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchXforms.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/BatchXforms.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/BatchXforms.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/types/Datastream.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/types/Datastream.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/types/Datastream.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/types/Datastream.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/types/DigitalObject.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/types/DigitalObject.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/batch/types/DigitalObject.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/batch/types/DigitalObject.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ArrayInputPanel.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ArrayInputPanel.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ArrayInputPanel.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ArrayInputPanel.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/BooleanInputPanel.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/BooleanInputPanel.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/BooleanInputPanel.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/BooleanInputPanel.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ByteArrayInputPanel.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ByteArrayInputPanel.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ByteArrayInputPanel.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ByteArrayInputPanel.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/Console.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/Console.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/Console.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/Console.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ConsoleCommand.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ConsoleCommand.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ConsoleCommand.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ConsoleCommand.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ConsoleCommandInvoker.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ConsoleCommandInvoker.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ConsoleCommandInvoker.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ConsoleCommandInvoker.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ConsoleSendButtonListener.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ConsoleSendButtonListener.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ConsoleSendButtonListener.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ConsoleSendButtonListener.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/DateTimeInputPanel.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/DateTimeInputPanel.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/DateTimeInputPanel.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/DateTimeInputPanel.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/InputPanel.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/InputPanel.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/InputPanel.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/InputPanel.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/InputPanelFactory.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/InputPanelFactory.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/InputPanelFactory.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/InputPanelFactory.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/InvokeDialogListener.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/InvokeDialogListener.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/InvokeDialogListener.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/InvokeDialogListener.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/NonNegativeIntegerInputPanel.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/NonNegativeIntegerInputPanel.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/NonNegativeIntegerInputPanel.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/NonNegativeIntegerInputPanel.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/NullInputPanel.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/NullInputPanel.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/NullInputPanel.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/NullInputPanel.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ServiceConsoleCommandFactory.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ServiceConsoleCommandFactory.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/ServiceConsoleCommandFactory.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/ServiceConsoleCommandFactory.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/StringInputPanel.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/StringInputPanel.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/StringInputPanel.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/StringInputPanel.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/access/AccessConsole.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/access/AccessConsole.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/access/AccessConsole.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/access/AccessConsole.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/management/ManagementConsole.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/management/ManagementConsole.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/console/management/ManagementConsole.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/console/management/ManagementConsole.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/datastream/DatastreamConduit.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/datastream/DatastreamConduit.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/datastream/DatastreamConduit.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/datastream/DatastreamConduit.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/export/ExportDialog.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/export/ExportDialog.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/export/ExportDialog.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/export/ExportDialog.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/export/ExportOptionsDialog.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/export/ExportOptionsDialog.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/export/ExportOptionsDialog.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/export/ExportOptionsDialog.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/ingest/IngestDialog.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/ingest/IngestDialog.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/ingest/IngestDialog.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/ingest/IngestDialog.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/ingest/SourceRepoDialog.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/ingest/SourceRepoDialog.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/ingest/SourceRepoDialog.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/ingest/SourceRepoDialog.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ContentEditor.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ContentEditor.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ContentEditor.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ContentEditor.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ContentHandlerFactory.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ContentHandlerFactory.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ContentHandlerFactory.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ContentHandlerFactory.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ContentViewer.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ContentViewer.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ContentViewer.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ContentViewer.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/DatastreamPane.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/DatastreamPane.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/DatastreamPane.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/DatastreamPane.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/DatastreamsPane.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/DatastreamsPane.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/DatastreamsPane.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/DatastreamsPane.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/EditingPane.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/EditingPane.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/EditingPane.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/EditingPane.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ImageContentViewer.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ImageContentViewer.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ImageContentViewer.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ImageContentViewer.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ImportDialog.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ImportDialog.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ImportDialog.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ImportDialog.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/NewRelsExtDatastreamPane.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/NewRelsExtDatastreamPane.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/NewRelsExtDatastreamPane.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/NewRelsExtDatastreamPane.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ObjectEditorFrame.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ObjectEditorFrame.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ObjectEditorFrame.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ObjectEditorFrame.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ObjectPane.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ObjectPane.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ObjectPane.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ObjectPane.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/PotentiallyDirty.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/PotentiallyDirty.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/PotentiallyDirty.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/PotentiallyDirty.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/RDFTupleEditor.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/RDFTupleEditor.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/RDFTupleEditor.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/RDFTupleEditor.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/SVGContentViewer.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/SVGContentViewer.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/SVGContentViewer.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/SVGContentViewer.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ServiceDescriptionPanel.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ServiceDescriptionPanel.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ServiceDescriptionPanel.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ServiceDescriptionPanel.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/SpringUtilities.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/SpringUtilities.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/SpringUtilities.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/SpringUtilities.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/TabDrawer.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/TabDrawer.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/TabDrawer.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/TabDrawer.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/TextContentEditor.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/TextContentEditor.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/TextContentEditor.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/TextContentEditor.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/Util.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/Util.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/Util.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/Util.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ValidityListener.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ValidityListener.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/ValidityListener.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/ValidityListener.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamBindingRule.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamBindingRule.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamBindingRule.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamBindingRule.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamInputSpec.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamInputSpec.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamInputSpec.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamInputSpec.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamInputSpecDeserializer.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamInputSpecDeserializer.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamInputSpecDeserializer.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/DatastreamInputSpecDeserializer.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/MethodDefinition.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/MethodDefinition.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/MethodDefinition.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/MethodDefinition.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/MethodDefinitionsDeserializer.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/MethodDefinitionsDeserializer.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/MethodDefinitionsDeserializer.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/MethodDefinitionsDeserializer.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/ParameterDefinition.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/ParameterDefinition.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/objecteditor/types/ParameterDefinition.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/objecteditor/types/ParameterDefinition.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/search/ResultFrame.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/search/ResultFrame.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/search/ResultFrame.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/search/ResultFrame.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/search/Search.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/search/Search.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/search/Search.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/search/Search.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/search/SearchResultParser.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/search/SearchResultParser.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/search/SearchResultParser.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/search/SearchResultParser.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/test/MassIngest.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/test/MassIngest.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/test/MassIngest.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/test/MassIngest.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/test/PerformanceTests.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/test/PerformanceTests.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/test/PerformanceTests.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/test/PerformanceTests.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/test/ScalabilityTests.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/test/ScalabilityTests.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/test/ScalabilityTests.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/test/ScalabilityTests.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/AutoFinder.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/AutoFinder.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/AutoFinder.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/AutoFinder.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/AutoPurger.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/AutoPurger.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/AutoPurger.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/AutoPurger.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/export/AutoExporter.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/export/AutoExporter.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/export/AutoExporter.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/export/AutoExporter.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/export/Export.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/export/Export.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/export/Export.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/export/Export.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/ingest/AutoIngestor.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/ingest/AutoIngestor.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/ingest/AutoIngestor.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/ingest/AutoIngestor.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/ingest/Ingest.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/ingest/Ingest.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/ingest/Ingest.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/ingest/Ingest.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/ingest/IngestCounter.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/ingest/IngestCounter.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/ingest/IngestCounter.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/ingest/IngestCounter.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/ingest/IngestLogger.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/ingest/IngestLogger.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/ingest/IngestLogger.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/ingest/IngestLogger.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/ingest/XMLBuilder.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/ingest/XMLBuilder.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/ingest/XMLBuilder.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/ingest/XMLBuilder.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/InvalidContentModelException.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/InvalidContentModelException.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/InvalidContentModelException.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/InvalidContentModelException.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectSource.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectSource.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectSource.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectSource.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectSourceException.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectSourceException.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectSourceException.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectSourceException.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectValidator.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectValidator.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectValidator.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ObjectValidator.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResult.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResult.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResult.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResult.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResultNotation.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResultNotation.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResultNotation.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResultNotation.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResults.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResults.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResults.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/ValidationResults.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/package-info.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/package-info.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/package-info.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/package-info.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/process/Log4jValidationResults.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/process/Log4jValidationResults.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/process/Log4jValidationResults.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/process/Log4jValidationResults.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/process/PidfileIterator.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/process/PidfileIterator.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/process/PidfileIterator.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/process/PidfileIterator.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcess.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcess.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcess.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcess.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcessParameters.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcessParameters.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcessParameters.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcessParameters.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcessUsageException.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcessUsageException.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcessUsageException.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/process/ValidatorProcessUsageException.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/remote/BasicFieldSearchResult.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/remote/BasicFieldSearchResult.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/remote/BasicFieldSearchResult.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/remote/BasicFieldSearchResult.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/remote/RemoteObjectSource.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/remote/RemoteObjectSource.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/remote/RemoteObjectSource.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/remote/RemoteObjectSource.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/remote/RemotePidIterator.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/remote/RemotePidIterator.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/remote/RemotePidIterator.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/remote/RemotePidIterator.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/remote/ServiceInfo.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/remote/ServiceInfo.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/remote/ServiceInfo.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/remote/ServiceInfo.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/remote/TypeUtility.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/remote/TypeUtility.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/remote/TypeUtility.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/remote/TypeUtility.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/BasicContentModelInfo.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/BasicContentModelInfo.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/BasicContentModelInfo.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/BasicContentModelInfo.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/BasicObjectInfo.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/BasicObjectInfo.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/BasicObjectInfo.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/BasicObjectInfo.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/ContentModelInfo.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/ContentModelInfo.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/ContentModelInfo.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/ContentModelInfo.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/DatastreamInfo.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/DatastreamInfo.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/DatastreamInfo.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/DatastreamInfo.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/DsCompositeModelDoc.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/DsCompositeModelDoc.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/DsCompositeModelDoc.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/DsCompositeModelDoc.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/ObjectInfo.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/ObjectInfo.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/ObjectInfo.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/ObjectInfo.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/RelationshipInfo.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/RelationshipInfo.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/client/utility/validate/types/RelationshipInfo.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/client/utility/validate/types/RelationshipInfo.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/ColumnComparator.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/ColumnComparator.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/ColumnComparator.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/ColumnComparator.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/DefaultSortTableModel.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/DefaultSortTableModel.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/DefaultSortTableModel.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/DefaultSortTableModel.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/JSortTable.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/JSortTable.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/JSortTable.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/JSortTable.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/JSortTableTest.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/JSortTableTest.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/JSortTableTest.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/JSortTableTest.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/SortArrowIcon.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/SortArrowIcon.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/SortArrowIcon.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/SortArrowIcon.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/SortHeaderRenderer.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/SortHeaderRenderer.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/SortHeaderRenderer.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/SortHeaderRenderer.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/SortTableModel.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/SortTableModel.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/jtable/SortTableModel.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/jtable/SortTableModel.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/mdi/MDIDesktopPane.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/mdi/MDIDesktopPane.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/mdi/MDIDesktopPane.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/mdi/MDIDesktopPane.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/mdi/WindowMenu.java b/fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/mdi/WindowMenu.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/java/fedora/swing/mdi/WindowMenu.java rename to fcrepo-client/fcrepo-admin-client/src/main/java/fedora/swing/mdi/WindowMenu.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/batch/batchtool.properties b/fcrepo-client/fcrepo-admin-client/src/main/resources/batch/batchtool.properties similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/batch/batchtool.properties rename to fcrepo-client/fcrepo-admin-client/src/main/resources/batch/batchtool.properties diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/batch/default.properties b/fcrepo-client/fcrepo-admin-client/src/main/resources/batch/default.properties similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/batch/default.properties rename to fcrepo-client/fcrepo-admin-client/src/main/resources/batch/default.properties diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/DemoSOAPClient.java b/fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/DemoSOAPClient.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/DemoSOAPClient.java rename to fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/DemoSOAPClient.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/obj_test_100.xml b/fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/obj_test_100.xml similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/obj_test_100.xml rename to fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/obj_test_100.xml diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/sdef_test_27.xml b/fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/sdef_test_27.xml similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/sdef_test_27.xml rename to fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/sdef_test_27.xml diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/sdep_test_28.xml b/fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/sdep_test_28.xml similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/sdep_test_28.xml rename to fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/sdep_test_28.xml diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/test_UVA_STD_IMAGE.xml b/fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/test_UVA_STD_IMAGE.xml similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/test_UVA_STD_IMAGE.xml rename to fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/TestIngestFiles/test_UVA_STD_IMAGE.xml diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/compile-demo-soapclient.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/compile-demo-soapclient.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/compile-demo-soapclient.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/compile-demo-soapclient.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/run-demo-soapclient.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/run-demo-soapclient.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient/run-demo-soapclient.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient/run-demo-soapclient.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/fedora/client/resources/Client.properties b/fcrepo-client/fcrepo-admin-client/src/main/resources/fedora/client/resources/Client.properties similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/fedora/client/resources/Client.properties rename to fcrepo-client/fcrepo-admin-client/src/main/resources/fedora/client/resources/Client.properties diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/fedora/client/resources/log4j.properties b/fcrepo-client/fcrepo-admin-client/src/main/resources/fedora/client/resources/log4j.properties similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/fedora/client/resources/log4j.properties rename to fcrepo-client/fcrepo-admin-client/src/main/resources/fedora/client/resources/log4j.properties diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/fedora/aboutadmin.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/fedora/aboutadmin.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/fedora/aboutadmin.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/fedora/aboutadmin.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/fedora/checkmark16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/fedora/checkmark16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/fedora/checkmark16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/fedora/checkmark16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/fedora/exclaim16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/fedora/exclaim16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/fedora/exclaim16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/fedora/exclaim16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/fedora/fedora-icon16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/fedora/fedora-icon16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/fedora/fedora-icon16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/fedora/fedora-icon16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Applet16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Applet16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Applet16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Applet16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Applet24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Applet24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Applet24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Applet24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Application16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Application16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Application16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Application16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Application24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Application24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Application24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Application24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/ApplicationDeploy16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/ApplicationDeploy16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/ApplicationDeploy16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/ApplicationDeploy16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/ApplicationDeploy24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/ApplicationDeploy24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/ApplicationDeploy24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/ApplicationDeploy24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Bean16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Bean16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Bean16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Bean16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Bean24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Bean24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Bean24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Bean24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/BeanAdd16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/BeanAdd16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/BeanAdd16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/BeanAdd16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/BeanAdd24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/BeanAdd24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/BeanAdd24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/BeanAdd24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBean16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBean16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBean16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBean16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBean24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBean24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBean24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBean24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBeanJar16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBeanJar16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBeanJar16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBeanJar16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBeanJar24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBeanJar24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBeanJar24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/EnterpriseJavaBeanJar24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Host16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Host16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Host16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Host16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Host24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Host24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Host24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Host24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplication16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplication16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplication16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplication16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplication24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplication24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplication24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplication24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClient16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClient16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClient16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClient16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClient24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClient24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClient24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClient24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClientAdd16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClientAdd16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClientAdd16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClientAdd16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClientAdd24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClientAdd24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClientAdd24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEApplicationClientAdd24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEServer16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEServer16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEServer16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEServer16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEServer24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEServer24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/J2EEServer24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/J2EEServer24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Jar16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Jar16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Jar16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Jar16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Jar24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Jar24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Jar24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Jar24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/JarAdd16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/JarAdd16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/JarAdd16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/JarAdd16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/JarAdd24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/JarAdd24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/JarAdd24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/JarAdd24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Server16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Server16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Server16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Server16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Server24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Server24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/Server24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/Server24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/War16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/War16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/War16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/War16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/War24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/War24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/War24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/War24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WarAdd16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WarAdd16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WarAdd16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WarAdd16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WarAdd24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WarAdd24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WarAdd24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WarAdd24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WebComponent16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WebComponent16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WebComponent16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WebComponent16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WebComponent24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WebComponent24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WebComponent24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WebComponent24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WebComponentAdd16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WebComponentAdd16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WebComponentAdd16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WebComponentAdd16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WebComponentAdd24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WebComponentAdd24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/development/WebComponentAdd24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/development/WebComponentAdd24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/About16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/About16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/About16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/About16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/About24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/About24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/About24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/About24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Add16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Add16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Add16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Add16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Add24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Add24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Add24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Add24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignBottom16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignBottom16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignBottom16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignBottom16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignBottom24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignBottom24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignBottom24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignBottom24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignCenter16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignCenter16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignCenter16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignCenter16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignCenter24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignCenter24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignCenter24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignCenter24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyHorizontal16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyHorizontal16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyHorizontal16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyHorizontal16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyHorizontal24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyHorizontal24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyHorizontal24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyHorizontal24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyVertical16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyVertical16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyVertical16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyVertical16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyVertical24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyVertical24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyVertical24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignJustifyVertical24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignLeft16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignLeft16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignLeft16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignLeft16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignLeft24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignLeft24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignLeft24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignLeft24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignRight16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignRight16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignRight16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignRight16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignRight24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignRight24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignRight24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignRight24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignTop16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignTop16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignTop16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignTop16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignTop24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignTop24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/AlignTop24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/AlignTop24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Bookmarks16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Bookmarks16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Bookmarks16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Bookmarks16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Bookmarks24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Bookmarks24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Bookmarks24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Bookmarks24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ComposeMail16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ComposeMail16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ComposeMail16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ComposeMail16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ComposeMail24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ComposeMail24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ComposeMail24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ComposeMail24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ContextualHelp16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ContextualHelp16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ContextualHelp16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ContextualHelp16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ContextualHelp24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ContextualHelp24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ContextualHelp24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ContextualHelp24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Copy16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Copy16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Copy16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Copy16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Copy24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Copy24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Copy24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Copy24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Cut16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Cut16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Cut16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Cut16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Cut24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Cut24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Cut24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Cut24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Delete16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Delete16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Delete16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Delete16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Delete24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Delete24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Delete24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Delete24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Edit16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Edit16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Edit16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Edit16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Edit24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Edit24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Edit24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Edit24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Export16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Export16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Export16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Export16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Export24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Export24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Export24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Export24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Find16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Find16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Find16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Find16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Find24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Find24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Find24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Find24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/FindAgain16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/FindAgain16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/FindAgain16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/FindAgain16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/FindAgain24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/FindAgain24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/FindAgain24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/FindAgain24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Help16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Help16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Help16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Help16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Help24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Help24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Help24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Help24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/History16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/History16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/History16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/History16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/History24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/History24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/History24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/History24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Import16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Import16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Import16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Import16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Import24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Import24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Import24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Import24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Information16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Information16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Information16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Information16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Information24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Information24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Information24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Information24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/New16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/New16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/New16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/New16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/New24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/New24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/New24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/New24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Open16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Open16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Open16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Open16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Open24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Open24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Open24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Open24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/PageSetup16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/PageSetup16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/PageSetup16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/PageSetup16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/PageSetup24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/PageSetup24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/PageSetup24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/PageSetup24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Paste16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Paste16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Paste16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Paste16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Paste24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Paste24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Paste24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Paste24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Preferences16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Preferences16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Preferences16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Preferences16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Preferences24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Preferences24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Preferences24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Preferences24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Print16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Print16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Print16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Print16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Print24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Print24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Print24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Print24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/PrintPreview16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/PrintPreview16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/PrintPreview16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/PrintPreview16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/PrintPreview24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/PrintPreview24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/PrintPreview24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/PrintPreview24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Properties16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Properties16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Properties16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Properties16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Properties24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Properties24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Properties24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Properties24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Redo16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Redo16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Redo16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Redo16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Redo24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Redo24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Redo24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Redo24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Refresh16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Refresh16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Refresh16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Refresh16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Refresh24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Refresh24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Refresh24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Refresh24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Remove16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Remove16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Remove16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Remove16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Remove24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Remove24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Remove24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Remove24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Replace16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Replace16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Replace16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Replace16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Replace24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Replace24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Replace24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Replace24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Save16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Save16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Save16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Save16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Save24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Save24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Save24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Save24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SaveAll16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SaveAll16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SaveAll16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SaveAll16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SaveAll24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SaveAll24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SaveAll24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SaveAll24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SaveAs16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SaveAs16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SaveAs16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SaveAs16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SaveAs24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SaveAs24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SaveAs24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SaveAs24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Search16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Search16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Search16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Search16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Search24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Search24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Search24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Search24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SendMail16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SendMail16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SendMail16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SendMail16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SendMail24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SendMail24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/SendMail24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/SendMail24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Stop16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Stop16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Stop16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Stop16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Stop24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Stop24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Stop24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Stop24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/TipOfTheDay16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/TipOfTheDay16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/TipOfTheDay16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/TipOfTheDay16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/TipOfTheDay24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/TipOfTheDay24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/TipOfTheDay24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/TipOfTheDay24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Undo16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Undo16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Undo16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Undo16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Undo24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Undo24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Undo24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Undo24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Zoom16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Zoom16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Zoom16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Zoom16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Zoom24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Zoom24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/Zoom24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/Zoom24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ZoomIn16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ZoomIn16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ZoomIn16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ZoomIn16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ZoomIn24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ZoomIn24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ZoomIn24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ZoomIn24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ZoomOut16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ZoomOut16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ZoomOut16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ZoomOut16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ZoomOut24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ZoomOut24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/general/ZoomOut24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/general/ZoomOut24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/FastForward16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/FastForward16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/FastForward16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/FastForward16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/FastForward24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/FastForward24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/FastForward24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/FastForward24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Movie16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Movie16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Movie16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Movie16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Movie24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Movie24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Movie24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Movie24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Pause16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Pause16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Pause16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Pause16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Pause24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Pause24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Pause24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Pause24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Play16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Play16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Play16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Play16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Play24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Play24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Play24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Play24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Rewind16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Rewind16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Rewind16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Rewind16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Rewind24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Rewind24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Rewind24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Rewind24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/StepBack16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/StepBack16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/StepBack16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/StepBack16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/StepBack24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/StepBack24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/StepBack24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/StepBack24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/StepForward16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/StepForward16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/StepForward16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/StepForward16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/StepForward24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/StepForward24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/StepForward24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/StepForward24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Stop16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Stop16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Stop16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Stop16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Stop24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Stop24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Stop24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Stop24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Volume16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Volume16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Volume16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Volume16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Volume24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Volume24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/media/Volume24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/media/Volume24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Back16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Back16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Back16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Back16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Back24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Back24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Back24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Back24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Down16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Down16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Down16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Down16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Down24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Down24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Down24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Down24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Forward16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Forward16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Forward16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Forward16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Forward24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Forward24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Forward24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Forward24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Home16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Home16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Home16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Home16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Home24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Home24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Home24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Home24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Up16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Up16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Up16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Up16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Up24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Up24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/navigation/Up24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/navigation/Up24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnDelete16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnDelete16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnDelete16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnDelete16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnDelete24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnDelete24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnDelete24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnDelete24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertAfter16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertAfter16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertAfter16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertAfter16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertAfter24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertAfter24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertAfter24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertAfter24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertBefore16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertBefore16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertBefore16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertBefore16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertBefore24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertBefore24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertBefore24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/ColumnInsertBefore24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowDelete16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowDelete16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowDelete16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowDelete16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowDelete24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowDelete24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowDelete24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowDelete24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowInsertAfter16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowInsertAfter16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowInsertAfter16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowInsertAfter16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowInsertAfter24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowInsertAfter24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowInsertAfter24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowInsertAfter24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowInsertBefore16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowInsertBefore16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowInsertBefore16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowInsertBefore16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowInsertBefore24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowInsertBefore24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/table/RowInsertBefore24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/table/RowInsertBefore24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignCenter16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignCenter16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignCenter16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignCenter16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignCenter24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignCenter24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignCenter24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignCenter24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignJustify16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignJustify16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignJustify16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignJustify16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignJustify24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignJustify24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignJustify24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignJustify24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignLeft16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignLeft16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignLeft16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignLeft16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignLeft24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignLeft24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignLeft24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignLeft24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignRight16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignRight16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignRight16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignRight16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignRight24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignRight24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/AlignRight24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/AlignRight24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Bold16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Bold16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Bold16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Bold16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Bold24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Bold24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Bold24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Bold24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Italic16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Italic16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Italic16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Italic16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Italic24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Italic24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Italic24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Italic24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Normal16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Normal16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Normal16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Normal16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Normal24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Normal24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Normal24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Normal24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Underline16.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Underline16.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Underline16.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Underline16.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Underline24.gif b/fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Underline24.gif similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/images/client/standard/text/Underline24.gif rename to fcrepo-client/fcrepo-admin-client/src/main/resources/images/client/standard/text/Underline24.gif diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/env-client.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/env-client.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/env-client.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/env-client.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-admin.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-admin.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-admin.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-admin.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-build.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-build.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-build.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-build.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-buildingest.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-buildingest.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-buildingest.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-buildingest.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-ingest.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-ingest.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-ingest.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-batch-ingest.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-dsinfo.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-dsinfo.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-dsinfo.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-dsinfo.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-export.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-export.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-export.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-export.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-find.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-find.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-find.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-find.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-ingest-demos.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-ingest-demos.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-ingest-demos.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-ingest-demos.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-ingest.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-ingest.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-ingest.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-ingest.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-massingest.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-massingest.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-massingest.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-massingest.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-modify.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-modify.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-modify.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-modify.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-purge.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-purge.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-purge.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-purge.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-validate-objects.bat b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-validate-objects.bat similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client/fedora-validate-objects.bat rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client/fedora-validate-objects.bat diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/env-client.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/env-client.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/env-client.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/env-client.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-admin.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-admin.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-admin.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-admin.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-build.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-build.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-build.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-build.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-buildingest.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-buildingest.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-buildingest.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-buildingest.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-ingest.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-ingest.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-ingest.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-batch-ingest.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-dsinfo.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-dsinfo.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-dsinfo.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-dsinfo.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-export.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-export.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-export.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-export.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-find.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-find.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-find.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-find.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-ingest-demos.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-ingest-demos.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-ingest-demos.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-ingest-demos.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-ingest.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-ingest.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-ingest.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-ingest.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-massingest.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-massingest.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-massingest.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-massingest.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-modify.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-modify.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-modify.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-modify.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-purge.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-purge.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-purge.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-purge.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-validate-objects.sh b/fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-validate-objects.sh similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client/fedora-validate-objects.sh rename to fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client/fedora-validate-objects.sh diff --git a/fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/AllUnitTests.java b/fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/AllUnitTests.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/AllUnitTests.java rename to fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/AllUnitTests.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/AllUnitTests.java b/fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/AllUnitTests.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/AllUnitTests.java rename to fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/AllUnitTests.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/AllUnitTests.java b/fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/AllUnitTests.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/AllUnitTests.java rename to fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/AllUnitTests.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/TestObjectValidator.java b/fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/TestObjectValidator.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/TestObjectValidator.java rename to fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/TestObjectValidator.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/process/AllUnitTests.java b/fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/process/AllUnitTests.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/process/AllUnitTests.java rename to fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/process/AllUnitTests.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/process/TestPidfileIterator.java b/fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/process/TestPidfileIterator.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/process/TestPidfileIterator.java rename to fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/process/TestPidfileIterator.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/process/TestValidatorProcessParameters.java b/fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/process/TestValidatorProcessParameters.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/process/TestValidatorProcessParameters.java rename to fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/process/TestValidatorProcessParameters.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/types/AllUnitTests.java b/fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/types/AllUnitTests.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/types/AllUnitTests.java rename to fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/types/AllUnitTests.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/types/TestDsCompositeModelDoc.java b/fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/types/TestDsCompositeModelDoc.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/test/java/fedora/client/utility/validate/types/TestDsCompositeModelDoc.java rename to fcrepo-client/fcrepo-admin-client/src/test/java/fedora/client/utility/validate/types/TestDsCompositeModelDoc.java diff --git a/fedorarepo-client/fedorarepo-admin-client/src/test/java/mock/fedora/client/utility/validate/MockObjectSource.java b/fcrepo-client/fcrepo-admin-client/src/test/java/mock/fedora/client/utility/validate/MockObjectSource.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/src/test/java/mock/fedora/client/utility/validate/MockObjectSource.java rename to fcrepo-client/fcrepo-admin-client/src/test/java/mock/fedora/client/utility/validate/MockObjectSource.java diff --git a/fedorarepo-client/fedorarepo-admin-client/stubwrappers/fedora/client/APIAStubWrapper.java b/fcrepo-client/fcrepo-admin-client/stubwrappers/fedora/client/APIAStubWrapper.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/stubwrappers/fedora/client/APIAStubWrapper.java rename to fcrepo-client/fcrepo-admin-client/stubwrappers/fedora/client/APIAStubWrapper.java diff --git a/fedorarepo-client/fedorarepo-admin-client/stubwrappers/fedora/client/APIMStubWrapper.java b/fcrepo-client/fcrepo-admin-client/stubwrappers/fedora/client/APIMStubWrapper.java similarity index 100% rename from fedorarepo-client/fedorarepo-admin-client/stubwrappers/fedora/client/APIMStubWrapper.java rename to fcrepo-client/fcrepo-admin-client/stubwrappers/fedora/client/APIMStubWrapper.java diff --git a/fedorarepo-client/fedorarepo-messaging-client/pom.xml b/fcrepo-client/fcrepo-messaging-client/pom.xml similarity index 92% rename from fedorarepo-client/fedorarepo-messaging-client/pom.xml rename to fcrepo-client/fcrepo-messaging-client/pom.xml index 848cdc727..e1628af5f 100644 --- a/fedorarepo-client/fedorarepo-messaging-client/pom.xml +++ b/fcrepo-client/fcrepo-messaging-client/pom.xml @@ -1,16 +1,16 @@ 4.0.0 - org.fedorarepo - fedorarepo-messaging-client + org.fcrepo + fcrepo-messaging-client jar 3.3-SNAPSHOT Fedora Messaging Client http://duraspace.org - org.fedorarepo - fedorarepo + org.fcrepo + fcrepo 3.3-SNAPSHOT ../pom.xml @@ -71,7 +71,7 @@ 2.2 - fedorarepo-messaging-client-jar + fcrepo-messaging-client-jar jar @@ -108,7 +108,7 @@ - fedorarepo-messaging-zip-assembly + fcrepo-messaging-zip-assembly package single @@ -121,7 +121,7 @@ - fedorarepo-messaging-jar-assembly + fcrepo-messaging-jar-assembly package single @@ -144,14 +144,14 @@ - org.fedorarepo - fedorarepo-common + org.fcrepo + fcrepo-common ${project.version} - org.fedorarepo - fedorarepo-server + org.fcrepo + fcrepo-server ${project.version} @@ -272,7 +272,7 @@ - org.fedorarepo - fedorarepo-messaging-client + org.fcrepo + fcrepo-messaging-client ${project.version} - org.fedorarepo - fedorarepo-messaging-client + org.fcrepo + fcrepo-messaging-client ${project.version} fedora-messaging zip - org.fedorarepo - fedorarepo-webapp + org.fcrepo + fcrepo-webapp war ${project.version} - org.fedorarepo + org.fcrepo one-jar-boot 0.96 - org.fedorarepo + org.fcrepo mulgara-core 2.1.1 diff --git a/fedorarepo-installer/src/main/resources/assemblies/fedora-home.xml b/fcrepo-installer/src/main/resources/assemblies/fedora-home.xml similarity index 71% rename from fedorarepo-installer/src/main/resources/assemblies/fedora-home.xml rename to fcrepo-installer/src/main/resources/assemblies/fedora-home.xml index 2385e70dc..eb6884353 100644 --- a/fedorarepo-installer/src/main/resources/assemblies/fedora-home.xml +++ b/fcrepo-installer/src/main/resources/assemblies/fedora-home.xml @@ -59,7 +59,7 @@ - ../fedorarepo-server/src/main/resources/xsl/access + ../fcrepo-server/src/main/resources/xsl/access /server/access *.xslt @@ -67,17 +67,17 @@ - ../fedorarepo-server/src/main/resources/scripts/bat/server + ../fcrepo-server/src/main/resources/scripts/bat/server /server/bin - ../fedorarepo-server/src/main/resources/scripts/sh/server + ../fcrepo-server/src/main/resources/scripts/sh/server /server/bin 0755 - ../fedorarepo-server/src/main/resources/fcfg/server + ../fcrepo-server/src/main/resources/fcfg/server /server/config fedora-users.xml @@ -85,7 +85,7 @@ - ../fedorarepo-server/src/main/resources/xsl/management + ../fcrepo-server/src/main/resources/xsl/management /server/management *.xslt @@ -93,7 +93,7 @@ - ../fedorarepo-server/src/main/resources/schematron + ../fcrepo-server/src/main/resources/schematron /server/schematron *.xml @@ -102,7 +102,7 @@ - ../fedorarepo-server/src/main/resources/xsd + ../fcrepo-server/src/main/resources/xsd /server/xsd *.xsd @@ -111,7 +111,7 @@ - ../fedorarepo-server/src/main/resources/xacml-policies + ../fcrepo-server/src/main/resources/xacml-policies /server/fedora-internal-use readme.txt @@ -120,12 +120,12 @@ - ../fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0 + ../fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0 /server/fedora-internal-use/fedora-internal-use-repository-policies-approximating-2.0 - ../fedorarepo-server/target + ../fcrepo-server/target /server/fedora-internal-use vocabulary.txt @@ -133,7 +133,7 @@ - ../fedorarepo-server/src/main/resources/xsl/security + ../fcrepo-server/src/main/resources/xsl/security /server/fedora-internal-use build-backend-policy.xsl @@ -141,7 +141,7 @@ - ../fedorarepo-server/src/main/resources/fcfg/server + ../fcrepo-server/src/main/resources/fcfg/server /server/fedora-internal-use/config fedora-base.fcfg @@ -156,7 +156,7 @@ - ../fedorarepo-server/src/main/resources/fcfg/server + ../fcrepo-server/src/main/resources/fcfg/server /server/config log4j.properties @@ -165,18 +165,18 @@ - ../fedorarepo-server/src/main/resources/demo/demo-objects/foxml + ../fcrepo-server/src/main/resources/demo/demo-objects/foxml /client/demo/foxml - ../fedorarepo-server/target/client/demo + ../fcrepo-server/target/client/demo /client/demo - ../fedorarepo-server/src/main/resources/xsl/batchtool + ../fcrepo-server/src/main/resources/xsl/batchtool /client/lib mets-merge.xsl @@ -185,12 +185,12 @@ - ../fedorarepo-server/src/main/resources/demo/demo-objects/batch-demo + ../fcrepo-server/src/main/resources/demo/demo-objects/batch-demo /client/demo/batch-demo - ../fedorarepo-server/src/main/resources/xml/batch-demo + ../fcrepo-server/src/main/resources/xml/batch-demo /client/demo/batch-demo @@ -204,27 +204,27 @@ - ../fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/bat/client + ../fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/bat/client /client/bin true - ../fedorarepo-client/fedorarepo-admin-client/src/main/resources/scripts/sh/client + ../fcrepo-client/fcrepo-admin-client/src/main/resources/scripts/sh/client /client/bin 0755 true - ../fedorarepo-client/fedorarepo-admin-client/src/main/resources/demo/demo-soapclient + ../fcrepo-client/fcrepo-admin-client/src/main/resources/demo/demo-soapclient /client/demo/soapclient true - ../fedorarepo-common/target/generated-sources/axistools/wsdl2java/fedora/server/management + ../fcrepo-common/target/generated-sources/axistools/wsdl2java/fedora/server/management /server/fedora-internal-use/deploy deploy.wsdd @@ -238,24 +238,24 @@ - ../fedorarepo-server/src/main/resources/fcfg/server/beSecurity-secure-apim.xml + ../fcrepo-server/src/main/resources/fcfg/server/beSecurity-secure-apim.xml /server/config beSecurity.xml - ../fedorarepo-common/target/generated-sources/axistools/wsdl2java/fedora/server/access/deploy.wsdd + ../fcrepo-common/target/generated-sources/axistools/wsdl2java/fedora/server/access/deploy.wsdd /server/fedora-internal-use/deploy deployAPI-A.wsdd - ../fedorarepo-common/target/generated-sources/axistools/wsdl2java/fedora/server/access/undeploy.wsdd + ../fcrepo-common/target/generated-sources/axistools/wsdl2java/fedora/server/access/undeploy.wsdd /server/fedora-internal-use/deploy undeployAPI-A.wsdd - ../fedorarepo-server/src/main/resources/xml/client-log4j.xml + ../fcrepo-server/src/main/resources/xml/client-log4j.xml /client log4j.xml @@ -269,8 +269,8 @@ - org.fedorarepo:fedorarepo-common - org.fedorarepo:fedorarepo-server + org.fcrepo:fcrepo-common + org.fcrepo:fcrepo-server - ../fedorarepo-server/src/main/resources/properties + ../fcrepo-server/src/main/resources/properties /resources install.properties @@ -16,7 +16,7 @@ - ../fedorarepo-server/src/main/resources/dbspec/server/fedora/server/storage/resources + ../fcrepo-server/src/main/resources/dbspec/server/fedora/server/storage/resources /resources DefaultDOManager.dbspec @@ -43,7 +43,7 @@ org.apache.derby:derbyclient:jar:10.5.3.0_1 org.apache.derby:derby:jar:10.5.3.0_1 - org.fedorarepo:mulgara-core:jar:2.1.1 + org.fcrepo:mulgara-core:jar:2.1.1 mckoi:mckoi:jar:1.0.2 mysql:mysql-connector-java:jar:5.1.6 postgresql:postgresql:jar:8.3-603.jdbc3 @@ -59,7 +59,7 @@ - org.fedorarepo:fedorarepo-fop:war:${project.version} + org.fcrepo:fcrepo-fop:war:${project.version} false + false /lib @@ -166,7 +166,7 @@ - org.fedorarepo:fedorarepo-server:jar:utilities-main:* + org.fcrepo:fcrepo-server:jar:utilities-main:* false /main @@ -179,7 +179,7 @@ - org.fedorarepo:one-jar-boot:jar:0.96 + org.fcrepo:one-jar-boot:jar:0.96 false true diff --git a/fedorarepo-installer/src/main/resources/assemblies/filter.properties b/fcrepo-installer/src/main/resources/assemblies/filter.properties similarity index 80% rename from fedorarepo-installer/src/main/resources/assemblies/filter.properties rename to fcrepo-installer/src/main/resources/assemblies/filter.properties index 79222bc5f..d1fe522b2 100644 --- a/fedorarepo-installer/src/main/resources/assemblies/filter.properties +++ b/fcrepo-installer/src/main/resources/assemblies/filter.properties @@ -1,6 +1,6 @@ # These name=value mappings are used to filter resources in the fedora-home assembly. # Used for client commandline scripts: -fedora-client-jar=fedorarepo-admin-client-${project.version}.jar +fedora-client-jar=fcrepo-admin-client-${project.version}.jar #Note: Temporary fix while propagating the version through the refactored clients. DWD 10/16/2009 #fedora-client-jar=fedora-admin-client-3.3.jar diff --git a/fedorarepo-integrationtest/pom.xml b/fcrepo-integrationtest/pom.xml similarity index 96% rename from fedorarepo-integrationtest/pom.xml rename to fcrepo-integrationtest/pom.xml index ae4a991db..c42656b6a 100644 --- a/fedorarepo-integrationtest/pom.xml +++ b/fcrepo-integrationtest/pom.xml @@ -1,16 +1,16 @@ 4.0.0 - org.fedorarepo - fedorarepo-integrationtest + org.fcrepo + fcrepo-integrationtest jar 3.3-SNAPSHOT Integration Test http://duraspace.org - org.fedorarepo - fedorarepo + org.fcrepo + fcrepo 3.3-SNAPSHOT ../pom.xml @@ -424,15 +424,15 @@ - org.fedorarepo - fedorarepo-common + org.fcrepo + fcrepo-common tests ${project.version} test @@ -440,29 +440,29 @@ - org.fedorarepo - fedorarepo-server + org.fcrepo + fcrepo-server tests ${project.version} test - org.fedorarepo - fedorarepo-admin-client + org.fcrepo + fcrepo-admin-client ${project.version} - org.fedorarepo + org.fcrepo jakarta-oro 2.0.5 - org.fedorarepo + org.fcrepo one-jar-boot 0.96 - org.fedorarepo + org.fcrepo openrdf-sesame-onejar 2.2.1 - org.fedorarepo + org.fcrepo mptstore 0.9.1 - org.fedorarepo + org.fcrepo saxon 9.0 - org.fedorarepo + org.fcrepo saxon-dom 9.0 - org.fedorarepo + org.fcrepo trippi-core 1.4.1 - org.fedorarepo + org.fcrepo trippi-mptstore 1.4.1 - org.fedorarepo + org.fcrepo trippi-mulgara 1.4.1 @@ -936,14 +936,14 @@ - org.fedorarepo - fedorarepo-common + org.fcrepo + fcrepo-common ${project.version} - org.fedorarepo - fedorarepo-common + org.fcrepo + fcrepo-common tests ${project.version} test @@ -989,26 +989,26 @@ - org.fedorarepo + org.fcrepo openrdf-sesame-onejar 2.2.1 - org.fedorarepo + org.fcrepo sunxacml 1.2-PATCHED - org.fedorarepo + org.fcrepo Tidy 1.0 - org.fedorarepo + org.fcrepo tt-bytecode 1.0 diff --git a/fedorarepo-server/src/main/java/fedora/oai/BadArgumentException.java b/fcrepo-server/src/main/java/fedora/oai/BadArgumentException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/BadArgumentException.java rename to fcrepo-server/src/main/java/fedora/oai/BadArgumentException.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/BadResumptionTokenException.java b/fcrepo-server/src/main/java/fedora/oai/BadResumptionTokenException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/BadResumptionTokenException.java rename to fcrepo-server/src/main/java/fedora/oai/BadResumptionTokenException.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/BadVerbException.java b/fcrepo-server/src/main/java/fedora/oai/BadVerbException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/BadVerbException.java rename to fcrepo-server/src/main/java/fedora/oai/BadVerbException.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/CannotDisseminateFormatException.java b/fcrepo-server/src/main/java/fedora/oai/CannotDisseminateFormatException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/CannotDisseminateFormatException.java rename to fcrepo-server/src/main/java/fedora/oai/CannotDisseminateFormatException.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/DateGranularitySupport.java b/fcrepo-server/src/main/java/fedora/oai/DateGranularitySupport.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/DateGranularitySupport.java rename to fcrepo-server/src/main/java/fedora/oai/DateGranularitySupport.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/DeletedRecordSupport.java b/fcrepo-server/src/main/java/fedora/oai/DeletedRecordSupport.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/DeletedRecordSupport.java rename to fcrepo-server/src/main/java/fedora/oai/DeletedRecordSupport.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/Header.java b/fcrepo-server/src/main/java/fedora/oai/Header.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/Header.java rename to fcrepo-server/src/main/java/fedora/oai/Header.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/IDDoesNotExistException.java b/fcrepo-server/src/main/java/fedora/oai/IDDoesNotExistException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/IDDoesNotExistException.java rename to fcrepo-server/src/main/java/fedora/oai/IDDoesNotExistException.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/MetadataFormat.java b/fcrepo-server/src/main/java/fedora/oai/MetadataFormat.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/MetadataFormat.java rename to fcrepo-server/src/main/java/fedora/oai/MetadataFormat.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/NoMetadataFormatsException.java b/fcrepo-server/src/main/java/fedora/oai/NoMetadataFormatsException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/NoMetadataFormatsException.java rename to fcrepo-server/src/main/java/fedora/oai/NoMetadataFormatsException.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/NoRecordsMatchException.java b/fcrepo-server/src/main/java/fedora/oai/NoRecordsMatchException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/NoRecordsMatchException.java rename to fcrepo-server/src/main/java/fedora/oai/NoRecordsMatchException.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/NoSetHierarchyException.java b/fcrepo-server/src/main/java/fedora/oai/NoSetHierarchyException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/NoSetHierarchyException.java rename to fcrepo-server/src/main/java/fedora/oai/NoSetHierarchyException.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/OAIException.java b/fcrepo-server/src/main/java/fedora/oai/OAIException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/OAIException.java rename to fcrepo-server/src/main/java/fedora/oai/OAIException.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/OAIProvider.java b/fcrepo-server/src/main/java/fedora/oai/OAIProvider.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/OAIProvider.java rename to fcrepo-server/src/main/java/fedora/oai/OAIProvider.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/OAIProviderServlet.java b/fcrepo-server/src/main/java/fedora/oai/OAIProviderServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/OAIProviderServlet.java rename to fcrepo-server/src/main/java/fedora/oai/OAIProviderServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/OAIResponder.java b/fcrepo-server/src/main/java/fedora/oai/OAIResponder.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/OAIResponder.java rename to fcrepo-server/src/main/java/fedora/oai/OAIResponder.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/Record.java b/fcrepo-server/src/main/java/fedora/oai/Record.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/Record.java rename to fcrepo-server/src/main/java/fedora/oai/Record.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/RepositoryException.java b/fcrepo-server/src/main/java/fedora/oai/RepositoryException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/RepositoryException.java rename to fcrepo-server/src/main/java/fedora/oai/RepositoryException.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/ResumptionToken.java b/fcrepo-server/src/main/java/fedora/oai/ResumptionToken.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/ResumptionToken.java rename to fcrepo-server/src/main/java/fedora/oai/ResumptionToken.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/SetInfo.java b/fcrepo-server/src/main/java/fedora/oai/SetInfo.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/SetInfo.java rename to fcrepo-server/src/main/java/fedora/oai/SetInfo.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/SimpleHeader.java b/fcrepo-server/src/main/java/fedora/oai/SimpleHeader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/SimpleHeader.java rename to fcrepo-server/src/main/java/fedora/oai/SimpleHeader.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/SimpleMetadataFormat.java b/fcrepo-server/src/main/java/fedora/oai/SimpleMetadataFormat.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/SimpleMetadataFormat.java rename to fcrepo-server/src/main/java/fedora/oai/SimpleMetadataFormat.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/SimpleRecord.java b/fcrepo-server/src/main/java/fedora/oai/SimpleRecord.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/SimpleRecord.java rename to fcrepo-server/src/main/java/fedora/oai/SimpleRecord.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/SimpleResumptionToken.java b/fcrepo-server/src/main/java/fedora/oai/SimpleResumptionToken.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/SimpleResumptionToken.java rename to fcrepo-server/src/main/java/fedora/oai/SimpleResumptionToken.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/SimpleSetInfo.java b/fcrepo-server/src/main/java/fedora/oai/SimpleSetInfo.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/SimpleSetInfo.java rename to fcrepo-server/src/main/java/fedora/oai/SimpleSetInfo.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/sample/RandomDCMetadataFactory.java b/fcrepo-server/src/main/java/fedora/oai/sample/RandomDCMetadataFactory.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/sample/RandomDCMetadataFactory.java rename to fcrepo-server/src/main/java/fedora/oai/sample/RandomDCMetadataFactory.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/sample/SampleOAIProvider.java b/fcrepo-server/src/main/java/fedora/oai/sample/SampleOAIProvider.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/sample/SampleOAIProvider.java rename to fcrepo-server/src/main/java/fedora/oai/sample/SampleOAIProvider.java diff --git a/fedorarepo-server/src/main/java/fedora/oai/sample/SampleOAIProviderServlet.java b/fcrepo-server/src/main/java/fedora/oai/sample/SampleOAIProviderServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/oai/sample/SampleOAIProviderServlet.java rename to fcrepo-server/src/main/java/fedora/oai/sample/SampleOAIProviderServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/BasicServer.java b/fcrepo-server/src/main/java/fedora/server/BasicServer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/BasicServer.java rename to fcrepo-server/src/main/java/fedora/server/BasicServer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/Context.java b/fcrepo-server/src/main/java/fedora/server/Context.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/Context.java rename to fcrepo-server/src/main/java/fedora/server/Context.java diff --git a/fedorarepo-server/src/main/java/fedora/server/DatastoreConfig.java b/fcrepo-server/src/main/java/fedora/server/DatastoreConfig.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/DatastoreConfig.java rename to fcrepo-server/src/main/java/fedora/server/DatastoreConfig.java diff --git a/fedorarepo-server/src/main/java/fedora/server/Module.java b/fcrepo-server/src/main/java/fedora/server/Module.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/Module.java rename to fcrepo-server/src/main/java/fedora/server/Module.java diff --git a/fedorarepo-server/src/main/java/fedora/server/MultiValueMap.java b/fcrepo-server/src/main/java/fedora/server/MultiValueMap.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/MultiValueMap.java rename to fcrepo-server/src/main/java/fedora/server/MultiValueMap.java diff --git a/fedorarepo-server/src/main/java/fedora/server/Parameterized.java b/fcrepo-server/src/main/java/fedora/server/Parameterized.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/Parameterized.java rename to fcrepo-server/src/main/java/fedora/server/Parameterized.java diff --git a/fedorarepo-server/src/main/java/fedora/server/Pluggable.java b/fcrepo-server/src/main/java/fedora/server/Pluggable.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/Pluggable.java rename to fcrepo-server/src/main/java/fedora/server/Pluggable.java diff --git a/fedorarepo-server/src/main/java/fedora/server/ReadOnlyContext.java b/fcrepo-server/src/main/java/fedora/server/ReadOnlyContext.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/ReadOnlyContext.java rename to fcrepo-server/src/main/java/fedora/server/ReadOnlyContext.java diff --git a/fedorarepo-server/src/main/java/fedora/server/RecoveryContext.java b/fcrepo-server/src/main/java/fedora/server/RecoveryContext.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/RecoveryContext.java rename to fcrepo-server/src/main/java/fedora/server/RecoveryContext.java diff --git a/fedorarepo-server/src/main/java/fedora/server/Server.java b/fcrepo-server/src/main/java/fedora/server/Server.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/Server.java rename to fcrepo-server/src/main/java/fedora/server/Server.java diff --git a/fedorarepo-server/src/main/java/fedora/server/ServerController.java b/fcrepo-server/src/main/java/fedora/server/ServerController.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/ServerController.java rename to fcrepo-server/src/main/java/fedora/server/ServerController.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/APIAStub.java b/fcrepo-server/src/main/java/fedora/server/access/APIAStub.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/APIAStub.java rename to fcrepo-server/src/main/java/fedora/server/access/APIAStub.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/Access.java b/fcrepo-server/src/main/java/fedora/server/access/Access.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/Access.java rename to fcrepo-server/src/main/java/fedora/server/access/Access.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/DefaultAccess.java b/fcrepo-server/src/main/java/fedora/server/access/DefaultAccess.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/DefaultAccess.java rename to fcrepo-server/src/main/java/fedora/server/access/DefaultAccess.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/DescribeRepositoryServlet.java b/fcrepo-server/src/main/java/fedora/server/access/DescribeRepositoryServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/DescribeRepositoryServlet.java rename to fcrepo-server/src/main/java/fedora/server/access/DescribeRepositoryServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/DynamicAccessImpl.java b/fcrepo-server/src/main/java/fedora/server/access/DynamicAccessImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/DynamicAccessImpl.java rename to fcrepo-server/src/main/java/fedora/server/access/DynamicAccessImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/DynamicAccessModule.java b/fcrepo-server/src/main/java/fedora/server/access/DynamicAccessModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/DynamicAccessModule.java rename to fcrepo-server/src/main/java/fedora/server/access/DynamicAccessModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/FedoraAPIABindingSOAPHTTPImpl.java b/fcrepo-server/src/main/java/fedora/server/access/FedoraAPIABindingSOAPHTTPImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/FedoraAPIABindingSOAPHTTPImpl.java rename to fcrepo-server/src/main/java/fedora/server/access/FedoraAPIABindingSOAPHTTPImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/FedoraAPIAServiceLocator.java b/fcrepo-server/src/main/java/fedora/server/access/FedoraAPIAServiceLocator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/FedoraAPIAServiceLocator.java rename to fcrepo-server/src/main/java/fedora/server/access/FedoraAPIAServiceLocator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/FedoraAccessServlet.java b/fcrepo-server/src/main/java/fedora/server/access/FedoraAccessServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/FedoraAccessServlet.java rename to fcrepo-server/src/main/java/fedora/server/access/FedoraAccessServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/FieldSearchServlet.java b/fcrepo-server/src/main/java/fedora/server/access/FieldSearchServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/FieldSearchServlet.java rename to fcrepo-server/src/main/java/fedora/server/access/FieldSearchServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/GetObjectHistoryServlet.java b/fcrepo-server/src/main/java/fedora/server/access/GetObjectHistoryServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/GetObjectHistoryServlet.java rename to fcrepo-server/src/main/java/fedora/server/access/GetObjectHistoryServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/ListDatastreamsServlet.java b/fcrepo-server/src/main/java/fedora/server/access/ListDatastreamsServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/ListDatastreamsServlet.java rename to fcrepo-server/src/main/java/fedora/server/access/ListDatastreamsServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/ListMethodsServlet.java b/fcrepo-server/src/main/java/fedora/server/access/ListMethodsServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/ListMethodsServlet.java rename to fcrepo-server/src/main/java/fedora/server/access/ListMethodsServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/MethodParameterResolverServlet.java b/fcrepo-server/src/main/java/fedora/server/access/MethodParameterResolverServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/MethodParameterResolverServlet.java rename to fcrepo-server/src/main/java/fedora/server/access/MethodParameterResolverServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/ObjectProfile.java b/fcrepo-server/src/main/java/fedora/server/access/ObjectProfile.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/ObjectProfile.java rename to fcrepo-server/src/main/java/fedora/server/access/ObjectProfile.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/RISearchServlet.java b/fcrepo-server/src/main/java/fedora/server/access/RISearchServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/RISearchServlet.java rename to fcrepo-server/src/main/java/fedora/server/access/RISearchServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/Report.java b/fcrepo-server/src/main/java/fedora/server/access/Report.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/Report.java rename to fcrepo-server/src/main/java/fedora/server/access/Report.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/ReportServlet.java b/fcrepo-server/src/main/java/fedora/server/access/ReportServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/ReportServlet.java rename to fcrepo-server/src/main/java/fedora/server/access/ReportServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/RepositoryInfo.java b/fcrepo-server/src/main/java/fedora/server/access/RepositoryInfo.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/RepositoryInfo.java rename to fcrepo-server/src/main/java/fedora/server/access/RepositoryInfo.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/WSDLServlet.java b/fcrepo-server/src/main/java/fedora/server/access/WSDLServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/WSDLServlet.java rename to fcrepo-server/src/main/java/fedora/server/access/WSDLServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/defaultdisseminator/DefaultDisseminator.java b/fcrepo-server/src/main/java/fedora/server/access/defaultdisseminator/DefaultDisseminator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/defaultdisseminator/DefaultDisseminator.java rename to fcrepo-server/src/main/java/fedora/server/access/defaultdisseminator/DefaultDisseminator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/defaultdisseminator/DefaultDisseminatorImpl.java b/fcrepo-server/src/main/java/fedora/server/access/defaultdisseminator/DefaultDisseminatorImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/defaultdisseminator/DefaultDisseminatorImpl.java rename to fcrepo-server/src/main/java/fedora/server/access/defaultdisseminator/DefaultDisseminatorImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/defaultdisseminator/InternalService.java b/fcrepo-server/src/main/java/fedora/server/access/defaultdisseminator/InternalService.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/defaultdisseminator/InternalService.java rename to fcrepo-server/src/main/java/fedora/server/access/defaultdisseminator/InternalService.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/defaultdisseminator/ObjectInfoAsXML.java b/fcrepo-server/src/main/java/fedora/server/access/defaultdisseminator/ObjectInfoAsXML.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/defaultdisseminator/ObjectInfoAsXML.java rename to fcrepo-server/src/main/java/fedora/server/access/defaultdisseminator/ObjectInfoAsXML.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/defaultdisseminator/ServiceMethodDispatcher.java b/fcrepo-server/src/main/java/fedora/server/access/defaultdisseminator/ServiceMethodDispatcher.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/defaultdisseminator/ServiceMethodDispatcher.java rename to fcrepo-server/src/main/java/fedora/server/access/defaultdisseminator/ServiceMethodDispatcher.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/dissemination/DatastreamResolverServlet.java b/fcrepo-server/src/main/java/fedora/server/access/dissemination/DatastreamResolverServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/dissemination/DatastreamResolverServlet.java rename to fcrepo-server/src/main/java/fedora/server/access/dissemination/DatastreamResolverServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/access/dissemination/DisseminationService.java b/fcrepo-server/src/main/java/fedora/server/access/dissemination/DisseminationService.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/access/dissemination/DisseminationService.java rename to fcrepo-server/src/main/java/fedora/server/access/dissemination/DisseminationService.java diff --git a/fedorarepo-server/src/main/java/fedora/server/behavior/MethodDef.java b/fcrepo-server/src/main/java/fedora/server/behavior/MethodDef.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/behavior/MethodDef.java rename to fcrepo-server/src/main/java/fedora/server/behavior/MethodDef.java diff --git a/fedorarepo-server/src/main/java/fedora/server/behavior/MethodParmDef.java b/fcrepo-server/src/main/java/fedora/server/behavior/MethodParmDef.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/behavior/MethodParmDef.java rename to fcrepo-server/src/main/java/fedora/server/behavior/MethodParmDef.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/Configuration.java b/fcrepo-server/src/main/java/fedora/server/config/Configuration.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/Configuration.java rename to fcrepo-server/src/main/java/fedora/server/config/Configuration.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/DatastoreConfiguration.java b/fcrepo-server/src/main/java/fedora/server/config/DatastoreConfiguration.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/DatastoreConfiguration.java rename to fcrepo-server/src/main/java/fedora/server/config/DatastoreConfiguration.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/ItemListModel.java b/fcrepo-server/src/main/java/fedora/server/config/ItemListModel.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/ItemListModel.java rename to fcrepo-server/src/main/java/fedora/server/config/ItemListModel.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/ModuleConfiguration.java b/fcrepo-server/src/main/java/fedora/server/config/ModuleConfiguration.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/ModuleConfiguration.java rename to fcrepo-server/src/main/java/fedora/server/config/ModuleConfiguration.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/Parameter.java b/fcrepo-server/src/main/java/fedora/server/config/Parameter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/Parameter.java rename to fcrepo-server/src/main/java/fedora/server/config/Parameter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/ParameterPanel.java b/fcrepo-server/src/main/java/fedora/server/config/ParameterPanel.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/ParameterPanel.java rename to fcrepo-server/src/main/java/fedora/server/config/ParameterPanel.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/ServerConfiguration.java b/fcrepo-server/src/main/java/fedora/server/config/ServerConfiguration.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/ServerConfiguration.java rename to fcrepo-server/src/main/java/fedora/server/config/ServerConfiguration.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/ServerConfigurationParser.java b/fcrepo-server/src/main/java/fedora/server/config/ServerConfigurationParser.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/ServerConfigurationParser.java rename to fcrepo-server/src/main/java/fedora/server/config/ServerConfigurationParser.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/AuthConstraint.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/AuthConstraint.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/AuthConstraint.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/AuthConstraint.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/ContextParam.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/ContextParam.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/ContextParam.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/ContextParam.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/ErrorPage.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/ErrorPage.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/ErrorPage.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/ErrorPage.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/Filter.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/Filter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/Filter.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/Filter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/FilterMapping.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/FilterMapping.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/FilterMapping.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/FilterMapping.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/InitParam.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/InitParam.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/InitParam.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/InitParam.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/Listener.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/Listener.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/Listener.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/Listener.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/LoginConfig.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/LoginConfig.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/LoginConfig.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/LoginConfig.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/SecurityConstraint.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/SecurityConstraint.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/SecurityConstraint.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/SecurityConstraint.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/SecurityRole.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/SecurityRole.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/SecurityRole.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/SecurityRole.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/Servlet.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/Servlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/Servlet.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/Servlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/ServletMapping.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/ServletMapping.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/ServletMapping.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/ServletMapping.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/UserDataConstraint.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/UserDataConstraint.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/UserDataConstraint.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/UserDataConstraint.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/WebResourceCollection.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/WebResourceCollection.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/WebResourceCollection.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/WebResourceCollection.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/WebXML.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/WebXML.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/WebXML.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/WebXML.java diff --git a/fedorarepo-server/src/main/java/fedora/server/config/webxml/WelcomeFileList.java b/fcrepo-server/src/main/java/fedora/server/config/webxml/WelcomeFileList.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/config/webxml/WelcomeFileList.java rename to fcrepo-server/src/main/java/fedora/server/config/webxml/WelcomeFileList.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/BackendSecurityParserException.java b/fcrepo-server/src/main/java/fedora/server/errors/BackendSecurityParserException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/BackendSecurityParserException.java rename to fcrepo-server/src/main/java/fedora/server/errors/BackendSecurityParserException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ConnectionPoolNotFoundException.java b/fcrepo-server/src/main/java/fedora/server/errors/ConnectionPoolNotFoundException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ConnectionPoolNotFoundException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ConnectionPoolNotFoundException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/DatastreamNotFoundException.java b/fcrepo-server/src/main/java/fedora/server/errors/DatastreamNotFoundException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/DatastreamNotFoundException.java rename to fcrepo-server/src/main/java/fedora/server/errors/DatastreamNotFoundException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/DisallowedHostException.java b/fcrepo-server/src/main/java/fedora/server/errors/DisallowedHostException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/DisallowedHostException.java rename to fcrepo-server/src/main/java/fedora/server/errors/DisallowedHostException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/DisseminationBindingInfoNotFoundException.java b/fcrepo-server/src/main/java/fedora/server/errors/DisseminationBindingInfoNotFoundException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/DisseminationBindingInfoNotFoundException.java rename to fcrepo-server/src/main/java/fedora/server/errors/DisseminationBindingInfoNotFoundException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/DisseminationException.java b/fcrepo-server/src/main/java/fedora/server/errors/DisseminationException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/DisseminationException.java rename to fcrepo-server/src/main/java/fedora/server/errors/DisseminationException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/DisseminatorNotFoundException.java b/fcrepo-server/src/main/java/fedora/server/errors/DisseminatorNotFoundException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/DisseminatorNotFoundException.java rename to fcrepo-server/src/main/java/fedora/server/errors/DisseminatorNotFoundException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/GeneralException.java b/fcrepo-server/src/main/java/fedora/server/errors/GeneralException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/GeneralException.java rename to fcrepo-server/src/main/java/fedora/server/errors/GeneralException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/HttpServiceNotFoundException.java b/fcrepo-server/src/main/java/fedora/server/errors/HttpServiceNotFoundException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/HttpServiceNotFoundException.java rename to fcrepo-server/src/main/java/fedora/server/errors/HttpServiceNotFoundException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/InconsistentTableSpecException.java b/fcrepo-server/src/main/java/fedora/server/errors/InconsistentTableSpecException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/InconsistentTableSpecException.java rename to fcrepo-server/src/main/java/fedora/server/errors/InconsistentTableSpecException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/InitializationException.java b/fcrepo-server/src/main/java/fedora/server/errors/InitializationException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/InitializationException.java rename to fcrepo-server/src/main/java/fedora/server/errors/InitializationException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/InvalidContextException.java b/fcrepo-server/src/main/java/fedora/server/errors/InvalidContextException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/InvalidContextException.java rename to fcrepo-server/src/main/java/fedora/server/errors/InvalidContextException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/InvalidIPSpecException.java b/fcrepo-server/src/main/java/fedora/server/errors/InvalidIPSpecException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/InvalidIPSpecException.java rename to fcrepo-server/src/main/java/fedora/server/errors/InvalidIPSpecException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/InvalidOperatorException.java b/fcrepo-server/src/main/java/fedora/server/errors/InvalidOperatorException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/InvalidOperatorException.java rename to fcrepo-server/src/main/java/fedora/server/errors/InvalidOperatorException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/InvalidStateException.java b/fcrepo-server/src/main/java/fedora/server/errors/InvalidStateException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/InvalidStateException.java rename to fcrepo-server/src/main/java/fedora/server/errors/InvalidStateException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/InvalidUserParmException.java b/fcrepo-server/src/main/java/fedora/server/errors/InvalidUserParmException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/InvalidUserParmException.java rename to fcrepo-server/src/main/java/fedora/server/errors/InvalidUserParmException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/InvalidXMLNameException.java b/fcrepo-server/src/main/java/fedora/server/errors/InvalidXMLNameException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/InvalidXMLNameException.java rename to fcrepo-server/src/main/java/fedora/server/errors/InvalidXMLNameException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/LowlevelStorageException.java b/fcrepo-server/src/main/java/fedora/server/errors/LowlevelStorageException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/LowlevelStorageException.java rename to fcrepo-server/src/main/java/fedora/server/errors/LowlevelStorageException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/LowlevelStorageInconsistencyException.java b/fcrepo-server/src/main/java/fedora/server/errors/LowlevelStorageInconsistencyException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/LowlevelStorageInconsistencyException.java rename to fcrepo-server/src/main/java/fedora/server/errors/LowlevelStorageInconsistencyException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/MalformedPidException.java b/fcrepo-server/src/main/java/fedora/server/errors/MalformedPidException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/MalformedPidException.java rename to fcrepo-server/src/main/java/fedora/server/errors/MalformedPidException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/MessagingException.java b/fcrepo-server/src/main/java/fedora/server/errors/MessagingException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/MessagingException.java rename to fcrepo-server/src/main/java/fedora/server/errors/MessagingException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/MethodNotFoundException.java b/fcrepo-server/src/main/java/fedora/server/errors/MethodNotFoundException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/MethodNotFoundException.java rename to fcrepo-server/src/main/java/fedora/server/errors/MethodNotFoundException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/MethodParmNotFoundException.java b/fcrepo-server/src/main/java/fedora/server/errors/MethodParmNotFoundException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/MethodParmNotFoundException.java rename to fcrepo-server/src/main/java/fedora/server/errors/MethodParmNotFoundException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ModuleInitializationException.java b/fcrepo-server/src/main/java/fedora/server/errors/ModuleInitializationException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ModuleInitializationException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ModuleInitializationException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ModuleShutdownException.java b/fcrepo-server/src/main/java/fedora/server/errors/ModuleShutdownException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ModuleShutdownException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ModuleShutdownException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ObjectAlreadyInLowlevelStorageException.java b/fcrepo-server/src/main/java/fedora/server/errors/ObjectAlreadyInLowlevelStorageException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ObjectAlreadyInLowlevelStorageException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ObjectAlreadyInLowlevelStorageException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ObjectDependencyException.java b/fcrepo-server/src/main/java/fedora/server/errors/ObjectDependencyException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ObjectDependencyException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ObjectDependencyException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ObjectExistsException.java b/fcrepo-server/src/main/java/fedora/server/errors/ObjectExistsException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ObjectExistsException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ObjectExistsException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ObjectIntegrityException.java b/fcrepo-server/src/main/java/fedora/server/errors/ObjectIntegrityException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ObjectIntegrityException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ObjectIntegrityException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ObjectLockedException.java b/fcrepo-server/src/main/java/fedora/server/errors/ObjectLockedException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ObjectLockedException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ObjectLockedException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ObjectNotFoundException.java b/fcrepo-server/src/main/java/fedora/server/errors/ObjectNotFoundException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ObjectNotFoundException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ObjectNotFoundException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ObjectNotInLowlevelStorageException.java b/fcrepo-server/src/main/java/fedora/server/errors/ObjectNotInLowlevelStorageException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ObjectNotInLowlevelStorageException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ObjectNotInLowlevelStorageException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ObjectValidityException.java b/fcrepo-server/src/main/java/fedora/server/errors/ObjectValidityException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ObjectValidityException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ObjectValidityException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/QueryParseException.java b/fcrepo-server/src/main/java/fedora/server/errors/QueryParseException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/QueryParseException.java rename to fcrepo-server/src/main/java/fedora/server/errors/QueryParseException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ReplicationException.java b/fcrepo-server/src/main/java/fedora/server/errors/ReplicationException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ReplicationException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ReplicationException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/RepositoryConfigurationException.java b/fcrepo-server/src/main/java/fedora/server/errors/RepositoryConfigurationException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/RepositoryConfigurationException.java rename to fcrepo-server/src/main/java/fedora/server/errors/RepositoryConfigurationException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ResourceIndexException.java b/fcrepo-server/src/main/java/fedora/server/errors/ResourceIndexException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ResourceIndexException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ResourceIndexException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ServerException.java b/fcrepo-server/src/main/java/fedora/server/errors/ServerException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ServerException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ServerException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ServerInitializationException.java b/fcrepo-server/src/main/java/fedora/server/errors/ServerInitializationException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ServerInitializationException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ServerInitializationException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ServerShutdownException.java b/fcrepo-server/src/main/java/fedora/server/errors/ServerShutdownException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ServerShutdownException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ServerShutdownException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ShutdownException.java b/fcrepo-server/src/main/java/fedora/server/errors/ShutdownException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ShutdownException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ShutdownException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/StorageDeviceException.java b/fcrepo-server/src/main/java/fedora/server/errors/StorageDeviceException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/StorageDeviceException.java rename to fcrepo-server/src/main/java/fedora/server/errors/StorageDeviceException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/StorageException.java b/fcrepo-server/src/main/java/fedora/server/errors/StorageException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/StorageException.java rename to fcrepo-server/src/main/java/fedora/server/errors/StorageException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/StreamIOException.java b/fcrepo-server/src/main/java/fedora/server/errors/StreamIOException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/StreamIOException.java rename to fcrepo-server/src/main/java/fedora/server/errors/StreamIOException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/StreamReadException.java b/fcrepo-server/src/main/java/fedora/server/errors/StreamReadException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/StreamReadException.java rename to fcrepo-server/src/main/java/fedora/server/errors/StreamReadException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/StreamWriteException.java b/fcrepo-server/src/main/java/fedora/server/errors/StreamWriteException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/StreamWriteException.java rename to fcrepo-server/src/main/java/fedora/server/errors/StreamWriteException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/UnknownSessionTokenException.java b/fcrepo-server/src/main/java/fedora/server/errors/UnknownSessionTokenException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/UnknownSessionTokenException.java rename to fcrepo-server/src/main/java/fedora/server/errors/UnknownSessionTokenException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/UnrecognizedFieldException.java b/fcrepo-server/src/main/java/fedora/server/errors/UnrecognizedFieldException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/UnrecognizedFieldException.java rename to fcrepo-server/src/main/java/fedora/server/errors/UnrecognizedFieldException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/UnsupportedQueryLanguageException.java b/fcrepo-server/src/main/java/fedora/server/errors/UnsupportedQueryLanguageException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/UnsupportedQueryLanguageException.java rename to fcrepo-server/src/main/java/fedora/server/errors/UnsupportedQueryLanguageException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/UnsupportedTranslationException.java b/fcrepo-server/src/main/java/fedora/server/errors/UnsupportedTranslationException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/UnsupportedTranslationException.java rename to fcrepo-server/src/main/java/fedora/server/errors/UnsupportedTranslationException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/ValidationException.java b/fcrepo-server/src/main/java/fedora/server/errors/ValidationException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/ValidationException.java rename to fcrepo-server/src/main/java/fedora/server/errors/ValidationException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/authorization/AuthzDeniedException.java b/fcrepo-server/src/main/java/fedora/server/errors/authorization/AuthzDeniedException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/authorization/AuthzDeniedException.java rename to fcrepo-server/src/main/java/fedora/server/errors/authorization/AuthzDeniedException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/authorization/AuthzException.java b/fcrepo-server/src/main/java/fedora/server/errors/authorization/AuthzException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/authorization/AuthzException.java rename to fcrepo-server/src/main/java/fedora/server/errors/authorization/AuthzException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/authorization/AuthzOperationalException.java b/fcrepo-server/src/main/java/fedora/server/errors/authorization/AuthzOperationalException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/authorization/AuthzOperationalException.java rename to fcrepo-server/src/main/java/fedora/server/errors/authorization/AuthzOperationalException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/authorization/AuthzPermittedException.java b/fcrepo-server/src/main/java/fedora/server/errors/authorization/AuthzPermittedException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/authorization/AuthzPermittedException.java rename to fcrepo-server/src/main/java/fedora/server/errors/authorization/AuthzPermittedException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/authorization/PasswordComparisonException.java b/fcrepo-server/src/main/java/fedora/server/errors/authorization/PasswordComparisonException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/authorization/PasswordComparisonException.java rename to fcrepo-server/src/main/java/fedora/server/errors/authorization/PasswordComparisonException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/BadRequest400Exception.java b/fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/BadRequest400Exception.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/BadRequest400Exception.java rename to fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/BadRequest400Exception.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Continue100Exception.java b/fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Continue100Exception.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Continue100Exception.java rename to fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Continue100Exception.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Forbidden403Exception.java b/fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Forbidden403Exception.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Forbidden403Exception.java rename to fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Forbidden403Exception.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/InternalError500Exception.java b/fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/InternalError500Exception.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/InternalError500Exception.java rename to fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/InternalError500Exception.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/NotFound404Exception.java b/fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/NotFound404Exception.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/NotFound404Exception.java rename to fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/NotFound404Exception.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Ok200Exception.java b/fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Ok200Exception.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Ok200Exception.java rename to fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Ok200Exception.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/RootException.java b/fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/RootException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/RootException.java rename to fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/RootException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Unauthorized401Exception.java b/fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Unauthorized401Exception.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Unauthorized401Exception.java rename to fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Unauthorized401Exception.java diff --git a/fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Unavailable503Exception.java b/fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Unavailable503Exception.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Unavailable503Exception.java rename to fcrepo-server/src/main/java/fedora/server/errors/servletExceptionExtensions/Unavailable503Exception.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/JournalConstants.java b/fcrepo-server/src/main/java/fedora/server/journal/JournalConstants.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/JournalConstants.java rename to fcrepo-server/src/main/java/fedora/server/journal/JournalConstants.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/JournalConsumer.java b/fcrepo-server/src/main/java/fedora/server/journal/JournalConsumer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/JournalConsumer.java rename to fcrepo-server/src/main/java/fedora/server/journal/JournalConsumer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/JournalConsumerThread.java b/fcrepo-server/src/main/java/fedora/server/journal/JournalConsumerThread.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/JournalConsumerThread.java rename to fcrepo-server/src/main/java/fedora/server/journal/JournalConsumerThread.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/JournalCreator.java b/fcrepo-server/src/main/java/fedora/server/journal/JournalCreator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/JournalCreator.java rename to fcrepo-server/src/main/java/fedora/server/journal/JournalCreator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/JournalException.java b/fcrepo-server/src/main/java/fedora/server/journal/JournalException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/JournalException.java rename to fcrepo-server/src/main/java/fedora/server/journal/JournalException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/JournalOperatingMode.java b/fcrepo-server/src/main/java/fedora/server/journal/JournalOperatingMode.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/JournalOperatingMode.java rename to fcrepo-server/src/main/java/fedora/server/journal/JournalOperatingMode.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/JournalReader.java b/fcrepo-server/src/main/java/fedora/server/journal/JournalReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/JournalReader.java rename to fcrepo-server/src/main/java/fedora/server/journal/JournalReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/JournalWorker.java b/fcrepo-server/src/main/java/fedora/server/journal/JournalWorker.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/JournalWorker.java rename to fcrepo-server/src/main/java/fedora/server/journal/JournalWorker.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/JournalWriter.java b/fcrepo-server/src/main/java/fedora/server/journal/JournalWriter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/JournalWriter.java rename to fcrepo-server/src/main/java/fedora/server/journal/JournalWriter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/Journaler.java b/fcrepo-server/src/main/java/fedora/server/journal/Journaler.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/Journaler.java rename to fcrepo-server/src/main/java/fedora/server/journal/Journaler.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/ServerInterface.java b/fcrepo-server/src/main/java/fedora/server/journal/ServerInterface.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/ServerInterface.java rename to fcrepo-server/src/main/java/fedora/server/journal/ServerInterface.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/ServerWrapper.java b/fcrepo-server/src/main/java/fedora/server/journal/ServerWrapper.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/ServerWrapper.java rename to fcrepo-server/src/main/java/fedora/server/journal/ServerWrapper.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/entry/ConsumerJournalEntry.java b/fcrepo-server/src/main/java/fedora/server/journal/entry/ConsumerJournalEntry.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/entry/ConsumerJournalEntry.java rename to fcrepo-server/src/main/java/fedora/server/journal/entry/ConsumerJournalEntry.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/entry/CreatorJournalEntry.java b/fcrepo-server/src/main/java/fedora/server/journal/entry/CreatorJournalEntry.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/entry/CreatorJournalEntry.java rename to fcrepo-server/src/main/java/fedora/server/journal/entry/CreatorJournalEntry.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/entry/JournalEntry.java b/fcrepo-server/src/main/java/fedora/server/journal/entry/JournalEntry.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/entry/JournalEntry.java rename to fcrepo-server/src/main/java/fedora/server/journal/entry/JournalEntry.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/entry/JournalEntryContext.java b/fcrepo-server/src/main/java/fedora/server/journal/entry/JournalEntryContext.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/entry/JournalEntryContext.java rename to fcrepo-server/src/main/java/fedora/server/journal/entry/JournalEntryContext.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/helpers/DecodingBase64OutputStream.java b/fcrepo-server/src/main/java/fedora/server/journal/helpers/DecodingBase64OutputStream.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/helpers/DecodingBase64OutputStream.java rename to fcrepo-server/src/main/java/fedora/server/journal/helpers/DecodingBase64OutputStream.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/helpers/EncodingBase64InputStream.java b/fcrepo-server/src/main/java/fedora/server/journal/helpers/EncodingBase64InputStream.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/helpers/EncodingBase64InputStream.java rename to fcrepo-server/src/main/java/fedora/server/journal/helpers/EncodingBase64InputStream.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/helpers/FileMovingUtil.java b/fcrepo-server/src/main/java/fedora/server/journal/helpers/FileMovingUtil.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/helpers/FileMovingUtil.java rename to fcrepo-server/src/main/java/fedora/server/journal/helpers/FileMovingUtil.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/helpers/JournalHelper.java b/fcrepo-server/src/main/java/fedora/server/journal/helpers/JournalHelper.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/helpers/JournalHelper.java rename to fcrepo-server/src/main/java/fedora/server/journal/helpers/JournalHelper.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/helpers/JournalTempFile.java b/fcrepo-server/src/main/java/fedora/server/journal/helpers/JournalTempFile.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/helpers/JournalTempFile.java rename to fcrepo-server/src/main/java/fedora/server/journal/helpers/JournalTempFile.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/helpers/ParameterHelper.java b/fcrepo-server/src/main/java/fedora/server/journal/helpers/ParameterHelper.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/helpers/ParameterHelper.java rename to fcrepo-server/src/main/java/fedora/server/journal/helpers/ParameterHelper.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/helpers/PasswordCipher.java b/fcrepo-server/src/main/java/fedora/server/journal/helpers/PasswordCipher.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/helpers/PasswordCipher.java rename to fcrepo-server/src/main/java/fedora/server/journal/helpers/PasswordCipher.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/AddDatastreamMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/AddDatastreamMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/AddDatastreamMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/AddDatastreamMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/AddRelationshipMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/AddRelationshipMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/AddRelationshipMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/AddRelationshipMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/GetNextPidMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/GetNextPidMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/GetNextPidMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/GetNextPidMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/IngestMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/IngestMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/IngestMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/IngestMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/ManagementMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/ManagementMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/ManagementMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/ManagementMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyDatastreamByReferenceMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyDatastreamByReferenceMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyDatastreamByReferenceMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyDatastreamByReferenceMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyDatastreamByValueMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyDatastreamByValueMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyDatastreamByValueMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyDatastreamByValueMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyObjectMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyObjectMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyObjectMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/ModifyObjectMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeDatastreamMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeDatastreamMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeDatastreamMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeDatastreamMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeObjectMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeObjectMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeObjectMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeObjectMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeRelationshipMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeRelationshipMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeRelationshipMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/PurgeRelationshipMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/PutTempStreamMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/PutTempStreamMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/PutTempStreamMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/PutTempStreamMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/SetDatastreamStateMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/SetDatastreamStateMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/SetDatastreamStateMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/SetDatastreamStateMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/SetDatastreamVersionableMethod.java b/fcrepo-server/src/main/java/fedora/server/journal/managementmethods/SetDatastreamVersionableMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/managementmethods/SetDatastreamVersionableMethod.java rename to fcrepo-server/src/main/java/fedora/server/journal/managementmethods/SetDatastreamVersionableMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/JournalEntrySizeEstimator.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/JournalEntrySizeEstimator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/JournalEntrySizeEstimator.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/JournalEntrySizeEstimator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/LocalDirectoryTransport.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/LocalDirectoryTransport.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/LocalDirectoryTransport.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/LocalDirectoryTransport.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/MulticastJournalWriter.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/MulticastJournalWriter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/MulticastJournalWriter.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/MulticastJournalWriter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/Transport.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/Transport.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/Transport.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/Transport.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/TransportOutputFile.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/TransportOutputFile.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/TransportOutputFile.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/TransportOutputFile.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/TransportParent.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/TransportParent.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/TransportParent.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/TransportParent.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/CloseFileRequest.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/CloseFileRequest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/CloseFileRequest.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/CloseFileRequest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/OpenFileRequest.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/OpenFileRequest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/OpenFileRequest.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/OpenFileRequest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/ShutdownRequest.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/ShutdownRequest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/ShutdownRequest.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/ShutdownRequest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/TransportRequest.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/TransportRequest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/TransportRequest.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/TransportRequest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/WriteEntryRequest.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/WriteEntryRequest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/WriteEntryRequest.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/request/WriteEntryRequest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiver.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiver.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiver.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiver.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverArguments.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverArguments.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverArguments.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverArguments.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverHelper.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverHelper.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverHelper.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverHelper.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverInterface.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverInterface.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverInterface.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiJournalReceiverInterface.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiTransport.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiTransport.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiTransport.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiTransport.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiTransportWriter.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiTransportWriter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiTransportWriter.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multicast/rmi/RmiTransportWriter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/JournalInputFile.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/JournalInputFile.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/JournalInputFile.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/JournalInputFile.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/JournalOutputFile.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/JournalOutputFile.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/JournalOutputFile.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/JournalOutputFile.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/LockingFollowingJournalReader.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/LockingFollowingJournalReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/LockingFollowingJournalReader.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/LockingFollowingJournalReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileFollowingJournalReader.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileFollowingJournalReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileFollowingJournalReader.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileFollowingJournalReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalConstants.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalConstants.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalConstants.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalConstants.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalHelper.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalHelper.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalHelper.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalHelper.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalReader.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalReader.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalWriter.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalWriter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalWriter.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/multifile/MultiFileJournalWriter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalConstants.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalConstants.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalConstants.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalConstants.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalReader.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalReader.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalWriter.java b/fcrepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalWriter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalWriter.java rename to fcrepo-server/src/main/java/fedora/server/journal/readerwriter/singlefile/SingleFileJournalWriter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/recoverylog/BufferedJournalRecoveryLog.java b/fcrepo-server/src/main/java/fedora/server/journal/recoverylog/BufferedJournalRecoveryLog.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/recoverylog/BufferedJournalRecoveryLog.java rename to fcrepo-server/src/main/java/fedora/server/journal/recoverylog/BufferedJournalRecoveryLog.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/recoverylog/JournalRecoveryLog.java b/fcrepo-server/src/main/java/fedora/server/journal/recoverylog/JournalRecoveryLog.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/recoverylog/JournalRecoveryLog.java rename to fcrepo-server/src/main/java/fedora/server/journal/recoverylog/JournalRecoveryLog.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/recoverylog/RenamingJournalRecoveryLog.java b/fcrepo-server/src/main/java/fedora/server/journal/recoverylog/RenamingJournalRecoveryLog.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/recoverylog/RenamingJournalRecoveryLog.java rename to fcrepo-server/src/main/java/fedora/server/journal/recoverylog/RenamingJournalRecoveryLog.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/recoverylog/UnbufferedJournalRecoveryLog.java b/fcrepo-server/src/main/java/fedora/server/journal/recoverylog/UnbufferedJournalRecoveryLog.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/recoverylog/UnbufferedJournalRecoveryLog.java rename to fcrepo-server/src/main/java/fedora/server/journal/recoverylog/UnbufferedJournalRecoveryLog.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/xmlhelpers/AbstractXmlReader.java b/fcrepo-server/src/main/java/fedora/server/journal/xmlhelpers/AbstractXmlReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/xmlhelpers/AbstractXmlReader.java rename to fcrepo-server/src/main/java/fedora/server/journal/xmlhelpers/AbstractXmlReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/xmlhelpers/AbstractXmlWriter.java b/fcrepo-server/src/main/java/fedora/server/journal/xmlhelpers/AbstractXmlWriter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/xmlhelpers/AbstractXmlWriter.java rename to fcrepo-server/src/main/java/fedora/server/journal/xmlhelpers/AbstractXmlWriter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/xmlhelpers/ContextXmlReader.java b/fcrepo-server/src/main/java/fedora/server/journal/xmlhelpers/ContextXmlReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/xmlhelpers/ContextXmlReader.java rename to fcrepo-server/src/main/java/fedora/server/journal/xmlhelpers/ContextXmlReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/journal/xmlhelpers/ContextXmlWriter.java b/fcrepo-server/src/main/java/fedora/server/journal/xmlhelpers/ContextXmlWriter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/journal/xmlhelpers/ContextXmlWriter.java rename to fcrepo-server/src/main/java/fedora/server/journal/xmlhelpers/ContextXmlWriter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/APIMStub.java b/fcrepo-server/src/main/java/fedora/server/management/APIMStub.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/APIMStub.java rename to fcrepo-server/src/main/java/fedora/server/management/APIMStub.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/BasicPIDGenerator.java b/fcrepo-server/src/main/java/fedora/server/management/BasicPIDGenerator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/BasicPIDGenerator.java rename to fcrepo-server/src/main/java/fedora/server/management/BasicPIDGenerator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/DBPIDGenerator.java b/fcrepo-server/src/main/java/fedora/server/management/DBPIDGenerator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/DBPIDGenerator.java rename to fcrepo-server/src/main/java/fedora/server/management/DBPIDGenerator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/DefaultManagement.java b/fcrepo-server/src/main/java/fedora/server/management/DefaultManagement.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/DefaultManagement.java rename to fcrepo-server/src/main/java/fedora/server/management/DefaultManagement.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/FedoraAPIMBindingSOAPHTTPImpl.java b/fcrepo-server/src/main/java/fedora/server/management/FedoraAPIMBindingSOAPHTTPImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/FedoraAPIMBindingSOAPHTTPImpl.java rename to fcrepo-server/src/main/java/fedora/server/management/FedoraAPIMBindingSOAPHTTPImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/FedoraAPIMServiceLocator.java b/fcrepo-server/src/main/java/fedora/server/management/FedoraAPIMServiceLocator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/FedoraAPIMServiceLocator.java rename to fcrepo-server/src/main/java/fedora/server/management/FedoraAPIMServiceLocator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/GetNextPIDServlet.java b/fcrepo-server/src/main/java/fedora/server/management/GetNextPIDServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/GetNextPIDServlet.java rename to fcrepo-server/src/main/java/fedora/server/management/GetNextPIDServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/Management.java b/fcrepo-server/src/main/java/fedora/server/management/Management.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/Management.java rename to fcrepo-server/src/main/java/fedora/server/management/Management.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/ManagementDelegate.java b/fcrepo-server/src/main/java/fedora/server/management/ManagementDelegate.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/ManagementDelegate.java rename to fcrepo-server/src/main/java/fedora/server/management/ManagementDelegate.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/ManagementModule.java b/fcrepo-server/src/main/java/fedora/server/management/ManagementModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/ManagementModule.java rename to fcrepo-server/src/main/java/fedora/server/management/ManagementModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/PIDGenerator.java b/fcrepo-server/src/main/java/fedora/server/management/PIDGenerator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/PIDGenerator.java rename to fcrepo-server/src/main/java/fedora/server/management/PIDGenerator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/management/UploadServlet.java b/fcrepo-server/src/main/java/fedora/server/management/UploadServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/management/UploadServlet.java rename to fcrepo-server/src/main/java/fedora/server/management/UploadServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/messaging/APIMMessage.java b/fcrepo-server/src/main/java/fedora/server/messaging/APIMMessage.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/messaging/APIMMessage.java rename to fcrepo-server/src/main/java/fedora/server/messaging/APIMMessage.java diff --git a/fedorarepo-server/src/main/java/fedora/server/messaging/AtomAPIMMessage.java b/fcrepo-server/src/main/java/fedora/server/messaging/AtomAPIMMessage.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/messaging/AtomAPIMMessage.java rename to fcrepo-server/src/main/java/fedora/server/messaging/AtomAPIMMessage.java diff --git a/fedorarepo-server/src/main/java/fedora/server/messaging/FedoraMessage.java b/fcrepo-server/src/main/java/fedora/server/messaging/FedoraMessage.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/messaging/FedoraMessage.java rename to fcrepo-server/src/main/java/fedora/server/messaging/FedoraMessage.java diff --git a/fedorarepo-server/src/main/java/fedora/server/messaging/FedoraMethod.java b/fcrepo-server/src/main/java/fedora/server/messaging/FedoraMethod.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/messaging/FedoraMethod.java rename to fcrepo-server/src/main/java/fedora/server/messaging/FedoraMethod.java diff --git a/fedorarepo-server/src/main/java/fedora/server/messaging/FedoraTypes.java b/fcrepo-server/src/main/java/fedora/server/messaging/FedoraTypes.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/messaging/FedoraTypes.java rename to fcrepo-server/src/main/java/fedora/server/messaging/FedoraTypes.java diff --git a/fedorarepo-server/src/main/java/fedora/server/messaging/JMSManager.java b/fcrepo-server/src/main/java/fedora/server/messaging/JMSManager.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/messaging/JMSManager.java rename to fcrepo-server/src/main/java/fedora/server/messaging/JMSManager.java diff --git a/fedorarepo-server/src/main/java/fedora/server/messaging/Messaging.java b/fcrepo-server/src/main/java/fedora/server/messaging/Messaging.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/messaging/Messaging.java rename to fcrepo-server/src/main/java/fedora/server/messaging/Messaging.java diff --git a/fedorarepo-server/src/main/java/fedora/server/messaging/MessagingImpl.java b/fcrepo-server/src/main/java/fedora/server/messaging/MessagingImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/messaging/MessagingImpl.java rename to fcrepo-server/src/main/java/fedora/server/messaging/MessagingImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/messaging/MessagingModule.java b/fcrepo-server/src/main/java/fedora/server/messaging/MessagingModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/messaging/MessagingModule.java rename to fcrepo-server/src/main/java/fedora/server/messaging/MessagingModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/messaging/NotificationInvocationHandler.java b/fcrepo-server/src/main/java/fedora/server/messaging/NotificationInvocationHandler.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/messaging/NotificationInvocationHandler.java rename to fcrepo-server/src/main/java/fedora/server/messaging/NotificationInvocationHandler.java diff --git a/fedorarepo-server/src/main/java/fedora/server/messaging/PName.java b/fcrepo-server/src/main/java/fedora/server/messaging/PName.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/messaging/PName.java rename to fcrepo-server/src/main/java/fedora/server/messaging/PName.java diff --git a/fedorarepo-server/src/main/java/fedora/server/oai/FedoraOAIProvider.java b/fcrepo-server/src/main/java/fedora/server/oai/FedoraOAIProvider.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/oai/FedoraOAIProvider.java rename to fcrepo-server/src/main/java/fedora/server/oai/FedoraOAIProvider.java diff --git a/fedorarepo-server/src/main/java/fedora/server/oai/FedoraOAIProviderModule.java b/fcrepo-server/src/main/java/fedora/server/oai/FedoraOAIProviderModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/oai/FedoraOAIProviderModule.java rename to fcrepo-server/src/main/java/fedora/server/oai/FedoraOAIProviderModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/oai/FedoraOAIProviderServlet.java b/fcrepo-server/src/main/java/fedora/server/oai/FedoraOAIProviderServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/oai/FedoraOAIProviderServlet.java rename to fcrepo-server/src/main/java/fedora/server/oai/FedoraOAIProviderServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/observer/ObserverQueue.java b/fcrepo-server/src/main/java/fedora/server/observer/ObserverQueue.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/observer/ObserverQueue.java rename to fcrepo-server/src/main/java/fedora/server/observer/ObserverQueue.java diff --git a/fedorarepo-server/src/main/java/fedora/server/observer/Publisher.java b/fcrepo-server/src/main/java/fedora/server/observer/Publisher.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/observer/Publisher.java rename to fcrepo-server/src/main/java/fedora/server/observer/Publisher.java diff --git a/fedorarepo-server/src/main/java/fedora/server/observer/Subscriber.java b/fcrepo-server/src/main/java/fedora/server/observer/Subscriber.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/observer/Subscriber.java rename to fcrepo-server/src/main/java/fedora/server/observer/Subscriber.java diff --git a/fedorarepo-server/src/main/java/fedora/server/proxy/AbstractInvocationHandler.java b/fcrepo-server/src/main/java/fedora/server/proxy/AbstractInvocationHandler.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/proxy/AbstractInvocationHandler.java rename to fcrepo-server/src/main/java/fedora/server/proxy/AbstractInvocationHandler.java diff --git a/fedorarepo-server/src/main/java/fedora/server/proxy/ProxyFactory.java b/fcrepo-server/src/main/java/fedora/server/proxy/ProxyFactory.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/proxy/ProxyFactory.java rename to fcrepo-server/src/main/java/fedora/server/proxy/ProxyFactory.java diff --git a/fedorarepo-server/src/main/java/fedora/server/resourceIndex/ContentModelTripleGenerator_3_0.java b/fcrepo-server/src/main/java/fedora/server/resourceIndex/ContentModelTripleGenerator_3_0.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/resourceIndex/ContentModelTripleGenerator_3_0.java rename to fcrepo-server/src/main/java/fedora/server/resourceIndex/ContentModelTripleGenerator_3_0.java diff --git a/fedorarepo-server/src/main/java/fedora/server/resourceIndex/FedoraObjectTripleGenerator_3_0.java b/fcrepo-server/src/main/java/fedora/server/resourceIndex/FedoraObjectTripleGenerator_3_0.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/resourceIndex/FedoraObjectTripleGenerator_3_0.java rename to fcrepo-server/src/main/java/fedora/server/resourceIndex/FedoraObjectTripleGenerator_3_0.java diff --git a/fedorarepo-server/src/main/java/fedora/server/resourceIndex/ModelBasedTripleGenerator.java b/fcrepo-server/src/main/java/fedora/server/resourceIndex/ModelBasedTripleGenerator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/resourceIndex/ModelBasedTripleGenerator.java rename to fcrepo-server/src/main/java/fedora/server/resourceIndex/ModelBasedTripleGenerator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndex.java b/fcrepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndex.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndex.java rename to fcrepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndex.java diff --git a/fedorarepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexImpl.java b/fcrepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexImpl.java rename to fcrepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexModule.java b/fcrepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexModule.java rename to fcrepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexRebuilder.java b/fcrepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexRebuilder.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexRebuilder.java rename to fcrepo-server/src/main/java/fedora/server/resourceIndex/ResourceIndexRebuilder.java diff --git a/fedorarepo-server/src/main/java/fedora/server/resourceIndex/ServiceDefinitionTripleGenerator_3_0.java b/fcrepo-server/src/main/java/fedora/server/resourceIndex/ServiceDefinitionTripleGenerator_3_0.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/resourceIndex/ServiceDefinitionTripleGenerator_3_0.java rename to fcrepo-server/src/main/java/fedora/server/resourceIndex/ServiceDefinitionTripleGenerator_3_0.java diff --git a/fedorarepo-server/src/main/java/fedora/server/resourceIndex/ServiceDeploymentTripleGenerator.java b/fcrepo-server/src/main/java/fedora/server/resourceIndex/ServiceDeploymentTripleGenerator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/resourceIndex/ServiceDeploymentTripleGenerator.java rename to fcrepo-server/src/main/java/fedora/server/resourceIndex/ServiceDeploymentTripleGenerator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/resourceIndex/TripleGenerator.java b/fcrepo-server/src/main/java/fedora/server/resourceIndex/TripleGenerator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/resourceIndex/TripleGenerator.java rename to fcrepo-server/src/main/java/fedora/server/resourceIndex/TripleGenerator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/resourceIndex/TripleGeneratorBase.java b/fcrepo-server/src/main/java/fedora/server/resourceIndex/TripleGeneratorBase.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/resourceIndex/TripleGeneratorBase.java rename to fcrepo-server/src/main/java/fedora/server/resourceIndex/TripleGeneratorBase.java diff --git a/fedorarepo-server/src/main/java/fedora/server/rest/BaseRestResource.java b/fcrepo-server/src/main/java/fedora/server/rest/BaseRestResource.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/rest/BaseRestResource.java rename to fcrepo-server/src/main/java/fedora/server/rest/BaseRestResource.java diff --git a/fedorarepo-server/src/main/java/fedora/server/rest/CopyUtils.java b/fcrepo-server/src/main/java/fedora/server/rest/CopyUtils.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/rest/CopyUtils.java rename to fcrepo-server/src/main/java/fedora/server/rest/CopyUtils.java diff --git a/fedorarepo-server/src/main/java/fedora/server/rest/DatastreamResource.java b/fcrepo-server/src/main/java/fedora/server/rest/DatastreamResource.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/rest/DatastreamResource.java rename to fcrepo-server/src/main/java/fedora/server/rest/DatastreamResource.java diff --git a/fedorarepo-server/src/main/java/fedora/server/rest/DefaultSerializer.java b/fcrepo-server/src/main/java/fedora/server/rest/DefaultSerializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/rest/DefaultSerializer.java rename to fcrepo-server/src/main/java/fedora/server/rest/DefaultSerializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/rest/FedoraObjectResource.java b/fcrepo-server/src/main/java/fedora/server/rest/FedoraObjectResource.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/rest/FedoraObjectResource.java rename to fcrepo-server/src/main/java/fedora/server/rest/FedoraObjectResource.java diff --git a/fedorarepo-server/src/main/java/fedora/server/rest/FedoraObjectSearchResource.java b/fcrepo-server/src/main/java/fedora/server/rest/FedoraObjectSearchResource.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/rest/FedoraObjectSearchResource.java rename to fcrepo-server/src/main/java/fedora/server/rest/FedoraObjectSearchResource.java diff --git a/fedorarepo-server/src/main/java/fedora/server/rest/MethodResource.java b/fcrepo-server/src/main/java/fedora/server/rest/MethodResource.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/rest/MethodResource.java rename to fcrepo-server/src/main/java/fedora/server/rest/MethodResource.java diff --git a/fedorarepo-server/src/main/java/fedora/server/rest/RestException.java b/fcrepo-server/src/main/java/fedora/server/rest/RestException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/rest/RestException.java rename to fcrepo-server/src/main/java/fedora/server/rest/RestException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/rest/RestHelper.java b/fcrepo-server/src/main/java/fedora/server/rest/RestHelper.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/rest/RestHelper.java rename to fcrepo-server/src/main/java/fedora/server/rest/RestHelper.java diff --git a/fedorarepo-server/src/main/java/fedora/server/rest/RestParam.java b/fcrepo-server/src/main/java/fedora/server/rest/RestParam.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/rest/RestParam.java rename to fcrepo-server/src/main/java/fedora/server/rest/RestParam.java diff --git a/fedorarepo-server/src/main/java/fedora/server/rest/RestUtil.java b/fcrepo-server/src/main/java/fedora/server/rest/RestUtil.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/rest/RestUtil.java rename to fcrepo-server/src/main/java/fedora/server/rest/RestUtil.java diff --git a/fedorarepo-server/src/main/java/fedora/server/search/Condition.java b/fcrepo-server/src/main/java/fedora/server/search/Condition.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/search/Condition.java rename to fcrepo-server/src/main/java/fedora/server/search/Condition.java diff --git a/fedorarepo-server/src/main/java/fedora/server/search/FieldSearch.java b/fcrepo-server/src/main/java/fedora/server/search/FieldSearch.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/search/FieldSearch.java rename to fcrepo-server/src/main/java/fedora/server/search/FieldSearch.java diff --git a/fedorarepo-server/src/main/java/fedora/server/search/FieldSearchQuery.java b/fcrepo-server/src/main/java/fedora/server/search/FieldSearchQuery.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/search/FieldSearchQuery.java rename to fcrepo-server/src/main/java/fedora/server/search/FieldSearchQuery.java diff --git a/fedorarepo-server/src/main/java/fedora/server/search/FieldSearchResult.java b/fcrepo-server/src/main/java/fedora/server/search/FieldSearchResult.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/search/FieldSearchResult.java rename to fcrepo-server/src/main/java/fedora/server/search/FieldSearchResult.java diff --git a/fedorarepo-server/src/main/java/fedora/server/search/FieldSearchResultSQLImpl.java b/fcrepo-server/src/main/java/fedora/server/search/FieldSearchResultSQLImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/search/FieldSearchResultSQLImpl.java rename to fcrepo-server/src/main/java/fedora/server/search/FieldSearchResultSQLImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/search/FieldSearchSQLImpl.java b/fcrepo-server/src/main/java/fedora/server/search/FieldSearchSQLImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/search/FieldSearchSQLImpl.java rename to fcrepo-server/src/main/java/fedora/server/search/FieldSearchSQLImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/search/FieldSearchSQLModule.java b/fcrepo-server/src/main/java/fedora/server/search/FieldSearchSQLModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/search/FieldSearchSQLModule.java rename to fcrepo-server/src/main/java/fedora/server/search/FieldSearchSQLModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/search/ObjectFields.java b/fcrepo-server/src/main/java/fedora/server/search/ObjectFields.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/search/ObjectFields.java rename to fcrepo-server/src/main/java/fedora/server/search/ObjectFields.java diff --git a/fedorarepo-server/src/main/java/fedora/server/search/Operator.java b/fcrepo-server/src/main/java/fedora/server/search/Operator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/search/Operator.java rename to fcrepo-server/src/main/java/fedora/server/search/Operator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/AbstractRoleConfig.java b/fcrepo-server/src/main/java/fedora/server/security/AbstractRoleConfig.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/AbstractRoleConfig.java rename to fcrepo-server/src/main/java/fedora/server/security/AbstractRoleConfig.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/AttributeFinderModule.java b/fcrepo-server/src/main/java/fedora/server/security/AttributeFinderModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/AttributeFinderModule.java rename to fcrepo-server/src/main/java/fedora/server/security/AttributeFinderModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/Authorization.java b/fcrepo-server/src/main/java/fedora/server/security/Authorization.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/Authorization.java rename to fcrepo-server/src/main/java/fedora/server/security/Authorization.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/BERoleConfig.java b/fcrepo-server/src/main/java/fedora/server/security/BERoleConfig.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/BERoleConfig.java rename to fcrepo-server/src/main/java/fedora/server/security/BERoleConfig.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/BESecurityConfig.java b/fcrepo-server/src/main/java/fedora/server/security/BESecurityConfig.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/BESecurityConfig.java rename to fcrepo-server/src/main/java/fedora/server/security/BESecurityConfig.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/BackendPolicies.java b/fcrepo-server/src/main/java/fedora/server/security/BackendPolicies.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/BackendPolicies.java rename to fcrepo-server/src/main/java/fedora/server/security/BackendPolicies.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/BackendSecurity.java b/fcrepo-server/src/main/java/fedora/server/security/BackendSecurity.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/BackendSecurity.java rename to fcrepo-server/src/main/java/fedora/server/security/BackendSecurity.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/BackendSecurityDeserializer.java b/fcrepo-server/src/main/java/fedora/server/security/BackendSecurityDeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/BackendSecurityDeserializer.java rename to fcrepo-server/src/main/java/fedora/server/security/BackendSecurityDeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/BackendSecuritySpec.java b/fcrepo-server/src/main/java/fedora/server/security/BackendSecuritySpec.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/BackendSecuritySpec.java rename to fcrepo-server/src/main/java/fedora/server/security/BackendSecuritySpec.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/ContextAttributeFinderModule.java b/fcrepo-server/src/main/java/fedora/server/security/ContextAttributeFinderModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/ContextAttributeFinderModule.java rename to fcrepo-server/src/main/java/fedora/server/security/ContextAttributeFinderModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/DefaultAuthorization.java b/fcrepo-server/src/main/java/fedora/server/security/DefaultAuthorization.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/DefaultAuthorization.java rename to fcrepo-server/src/main/java/fedora/server/security/DefaultAuthorization.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/DefaultBackendSecurity.java b/fcrepo-server/src/main/java/fedora/server/security/DefaultBackendSecurity.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/DefaultBackendSecurity.java rename to fcrepo-server/src/main/java/fedora/server/security/DefaultBackendSecurity.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/DefaultRoleConfig.java b/fcrepo-server/src/main/java/fedora/server/security/DefaultRoleConfig.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/DefaultRoleConfig.java rename to fcrepo-server/src/main/java/fedora/server/security/DefaultRoleConfig.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/MethodRoleConfig.java b/fcrepo-server/src/main/java/fedora/server/security/MethodRoleConfig.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/MethodRoleConfig.java rename to fcrepo-server/src/main/java/fedora/server/security/MethodRoleConfig.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/PolicyEnforcementPoint.java b/fcrepo-server/src/main/java/fedora/server/security/PolicyEnforcementPoint.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/PolicyEnforcementPoint.java rename to fcrepo-server/src/main/java/fedora/server/security/PolicyEnforcementPoint.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/PolicyFinderModule.java b/fcrepo-server/src/main/java/fedora/server/security/PolicyFinderModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/PolicyFinderModule.java rename to fcrepo-server/src/main/java/fedora/server/security/PolicyFinderModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/PolicyParser.java b/fcrepo-server/src/main/java/fedora/server/security/PolicyParser.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/PolicyParser.java rename to fcrepo-server/src/main/java/fedora/server/security/PolicyParser.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/ResourceAttributeFinderModule.java b/fcrepo-server/src/main/java/fedora/server/security/ResourceAttributeFinderModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/ResourceAttributeFinderModule.java rename to fcrepo-server/src/main/java/fedora/server/security/ResourceAttributeFinderModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/ServiceDeploymentRoleConfig.java b/fcrepo-server/src/main/java/fedora/server/security/ServiceDeploymentRoleConfig.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/ServiceDeploymentRoleConfig.java rename to fcrepo-server/src/main/java/fedora/server/security/ServiceDeploymentRoleConfig.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/Base.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/Base.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/Base.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/Base.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/BaseCaching.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/BaseCaching.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/BaseCaching.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/BaseCaching.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/BaseContributing.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/BaseContributing.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/BaseContributing.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/BaseContributing.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/Cache.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/Cache.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/Cache.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/Cache.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/CacheElement.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/CacheElement.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/CacheElement.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/CacheElement.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/CacheElementPopulator.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/CacheElementPopulator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/CacheElementPopulator.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/CacheElementPopulator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/ExtendedHttpServletRequest.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/ExtendedHttpServletRequest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/ExtendedHttpServletRequest.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/ExtendedHttpServletRequest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/ExtendedHttpServletRequestWrapper.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/ExtendedHttpServletRequestWrapper.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/ExtendedHttpServletRequestWrapper.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/ExtendedHttpServletRequestWrapper.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FilterEnforceAuthn.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/FilterEnforceAuthn.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FilterEnforceAuthn.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/FilterEnforceAuthn.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FilterFinalize.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/FilterFinalize.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FilterFinalize.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/FilterFinalize.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FilterRestApiAuthn.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/FilterRestApiAuthn.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FilterRestApiAuthn.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/FilterRestApiAuthn.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FilterRestApiFlash.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/FilterRestApiFlash.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FilterRestApiFlash.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/FilterRestApiFlash.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FilterSetup.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/FilterSetup.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FilterSetup.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/FilterSetup.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FinishedParsingException.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/FinishedParsingException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/FinishedParsingException.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/FinishedParsingException.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/ImmutableHashSet.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/ImmutableHashSet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/ImmutableHashSet.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/ImmutableHashSet.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/Principal.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/Principal.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/Principal.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/Principal.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/ldap/FilterLdap.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/ldap/FilterLdap.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/ldap/FilterLdap.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/ldap/FilterLdap.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/pubcookie/ConnectPubcookie.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/pubcookie/ConnectPubcookie.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/pubcookie/ConnectPubcookie.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/pubcookie/ConnectPubcookie.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/pubcookie/FilterPubcookie.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/pubcookie/FilterPubcookie.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/pubcookie/FilterPubcookie.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/pubcookie/FilterPubcookie.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/Attribute.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/Attribute.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/Attribute.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/Attribute.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/FedoraUsers.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/FedoraUsers.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/FedoraUsers.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/FedoraUsers.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/FilterXmlUserfile.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/FilterXmlUserfile.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/FilterXmlUserfile.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/FilterXmlUserfile.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/ParserXmlUserfile.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/ParserXmlUserfile.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/ParserXmlUserfile.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/ParserXmlUserfile.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/Role.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/Role.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/Role.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/Role.java diff --git a/fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/User.java b/fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/User.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/User.java rename to fcrepo-server/src/main/java/fedora/server/security/servletfilters/xmluserfile/User.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/ConnectionPool.java b/fcrepo-server/src/main/java/fedora/server/storage/ConnectionPool.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/ConnectionPool.java rename to fcrepo-server/src/main/java/fedora/server/storage/ConnectionPool.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/ConnectionPoolManager.java b/fcrepo-server/src/main/java/fedora/server/storage/ConnectionPoolManager.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/ConnectionPoolManager.java rename to fcrepo-server/src/main/java/fedora/server/storage/ConnectionPoolManager.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/ConnectionPoolManagerImpl.java b/fcrepo-server/src/main/java/fedora/server/storage/ConnectionPoolManagerImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/ConnectionPoolManagerImpl.java rename to fcrepo-server/src/main/java/fedora/server/storage/ConnectionPoolManagerImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/ContentManagerParams.java b/fcrepo-server/src/main/java/fedora/server/storage/ContentManagerParams.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/ContentManagerParams.java rename to fcrepo-server/src/main/java/fedora/server/storage/ContentManagerParams.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/DOManager.java b/fcrepo-server/src/main/java/fedora/server/storage/DOManager.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/DOManager.java rename to fcrepo-server/src/main/java/fedora/server/storage/DOManager.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/DOReader.java b/fcrepo-server/src/main/java/fedora/server/storage/DOReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/DOReader.java rename to fcrepo-server/src/main/java/fedora/server/storage/DOReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/DOReaderCache.java b/fcrepo-server/src/main/java/fedora/server/storage/DOReaderCache.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/DOReaderCache.java rename to fcrepo-server/src/main/java/fedora/server/storage/DOReaderCache.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/DOReaderSAXErrorHandler.java b/fcrepo-server/src/main/java/fedora/server/storage/DOReaderSAXErrorHandler.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/DOReaderSAXErrorHandler.java rename to fcrepo-server/src/main/java/fedora/server/storage/DOReaderSAXErrorHandler.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/DORegistry.java b/fcrepo-server/src/main/java/fedora/server/storage/DORegistry.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/DORegistry.java rename to fcrepo-server/src/main/java/fedora/server/storage/DORegistry.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/DOWriter.java b/fcrepo-server/src/main/java/fedora/server/storage/DOWriter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/DOWriter.java rename to fcrepo-server/src/main/java/fedora/server/storage/DOWriter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/DefaultDOManager.java b/fcrepo-server/src/main/java/fedora/server/storage/DefaultDOManager.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/DefaultDOManager.java rename to fcrepo-server/src/main/java/fedora/server/storage/DefaultDOManager.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/DefaultExternalContentManager.java b/fcrepo-server/src/main/java/fedora/server/storage/DefaultExternalContentManager.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/DefaultExternalContentManager.java rename to fcrepo-server/src/main/java/fedora/server/storage/DefaultExternalContentManager.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/DirectoryBasedRepositoryReader.java b/fcrepo-server/src/main/java/fedora/server/storage/DirectoryBasedRepositoryReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/DirectoryBasedRepositoryReader.java rename to fcrepo-server/src/main/java/fedora/server/storage/DirectoryBasedRepositoryReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/ExternalContentManager.java b/fcrepo-server/src/main/java/fedora/server/storage/ExternalContentManager.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/ExternalContentManager.java rename to fcrepo-server/src/main/java/fedora/server/storage/ExternalContentManager.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/GSearchDOManager.java b/fcrepo-server/src/main/java/fedora/server/storage/GSearchDOManager.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/GSearchDOManager.java rename to fcrepo-server/src/main/java/fedora/server/storage/GSearchDOManager.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/RDFRelationshipReader.java b/fcrepo-server/src/main/java/fedora/server/storage/RDFRelationshipReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/RDFRelationshipReader.java rename to fcrepo-server/src/main/java/fedora/server/storage/RDFRelationshipReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/RepositoryReader.java b/fcrepo-server/src/main/java/fedora/server/storage/RepositoryReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/RepositoryReader.java rename to fcrepo-server/src/main/java/fedora/server/storage/RepositoryReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/ServiceDefinitionReader.java b/fcrepo-server/src/main/java/fedora/server/storage/ServiceDefinitionReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/ServiceDefinitionReader.java rename to fcrepo-server/src/main/java/fedora/server/storage/ServiceDefinitionReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/ServiceDeploymentReader.java b/fcrepo-server/src/main/java/fedora/server/storage/ServiceDeploymentReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/ServiceDeploymentReader.java rename to fcrepo-server/src/main/java/fedora/server/storage/ServiceDeploymentReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/SimpleDOReader.java b/fcrepo-server/src/main/java/fedora/server/storage/SimpleDOReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/SimpleDOReader.java rename to fcrepo-server/src/main/java/fedora/server/storage/SimpleDOReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/SimpleDOWriter.java b/fcrepo-server/src/main/java/fedora/server/storage/SimpleDOWriter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/SimpleDOWriter.java rename to fcrepo-server/src/main/java/fedora/server/storage/SimpleDOWriter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/SimpleServiceAwareReader.java b/fcrepo-server/src/main/java/fedora/server/storage/SimpleServiceAwareReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/SimpleServiceAwareReader.java rename to fcrepo-server/src/main/java/fedora/server/storage/SimpleServiceAwareReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/SimpleServiceDefinitionReader.java b/fcrepo-server/src/main/java/fedora/server/storage/SimpleServiceDefinitionReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/SimpleServiceDefinitionReader.java rename to fcrepo-server/src/main/java/fedora/server/storage/SimpleServiceDefinitionReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/SimpleServiceDeploymentReader.java b/fcrepo-server/src/main/java/fedora/server/storage/SimpleServiceDeploymentReader.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/SimpleServiceDeploymentReader.java rename to fcrepo-server/src/main/java/fedora/server/storage/SimpleServiceDeploymentReader.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/StreamValidator.java b/fcrepo-server/src/main/java/fedora/server/storage/StreamValidator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/StreamValidator.java rename to fcrepo-server/src/main/java/fedora/server/storage/StreamValidator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/DBPathRegistry.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/DBPathRegistry.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/DBPathRegistry.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/DBPathRegistry.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/DefaultLowlevelStorage.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/DefaultLowlevelStorage.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/DefaultLowlevelStorage.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/DefaultLowlevelStorage.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/DefaultLowlevelStorageModule.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/DefaultLowlevelStorageModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/DefaultLowlevelStorageModule.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/DefaultLowlevelStorageModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/FileSystem.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/FileSystem.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/FileSystem.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/FileSystem.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/GenericFileSystem.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/GenericFileSystem.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/GenericFileSystem.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/GenericFileSystem.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/IListable.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/IListable.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/IListable.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/IListable.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/ILowlevelStorage.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/ILowlevelStorage.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/ILowlevelStorage.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/ILowlevelStorage.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/PathAlgorithm.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/PathAlgorithm.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/PathAlgorithm.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/PathAlgorithm.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/PathRegistry.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/PathRegistry.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/PathRegistry.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/PathRegistry.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/SimplePathRegistry.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/SimplePathRegistry.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/SimplePathRegistry.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/SimplePathRegistry.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/TimestampPathAlgorithm.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/TimestampPathAlgorithm.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/TimestampPathAlgorithm.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/TimestampPathAlgorithm.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorage.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorage.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorage.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorage.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorageModule.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorageModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorageModule.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorageModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/HashPathIdMapper.java b/fcrepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/HashPathIdMapper.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/HashPathIdMapper.java rename to fcrepo-server/src/main/java/fedora/server/storage/lowlevel/akubra/HashPathIdMapper.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/AbstractOperation.java b/fcrepo-server/src/main/java/fedora/server/storage/service/AbstractOperation.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/AbstractOperation.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/AbstractOperation.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/Binding.java b/fcrepo-server/src/main/java/fedora/server/storage/service/Binding.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/Binding.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/Binding.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/DSInputSpecParser.java b/fcrepo-server/src/main/java/fedora/server/storage/service/DSInputSpecParser.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/DSInputSpecParser.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/DSInputSpecParser.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/HTTPBinding.java b/fcrepo-server/src/main/java/fedora/server/storage/service/HTTPBinding.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/HTTPBinding.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/HTTPBinding.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/HTTPOperation.java b/fcrepo-server/src/main/java/fedora/server/storage/service/HTTPOperation.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/HTTPOperation.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/HTTPOperation.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/HTTPOperationInOut.java b/fcrepo-server/src/main/java/fedora/server/storage/service/HTTPOperationInOut.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/HTTPOperationInOut.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/HTTPOperationInOut.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/MIMEContent.java b/fcrepo-server/src/main/java/fedora/server/storage/service/MIMEContent.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/MIMEContent.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/MIMEContent.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/Message.java b/fcrepo-server/src/main/java/fedora/server/storage/service/Message.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/Message.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/Message.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/Mmap.java b/fcrepo-server/src/main/java/fedora/server/storage/service/Mmap.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/Mmap.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/Mmap.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/MmapMethodDef.java b/fcrepo-server/src/main/java/fedora/server/storage/service/MmapMethodDef.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/MmapMethodDef.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/MmapMethodDef.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/MmapMethodParmDef.java b/fcrepo-server/src/main/java/fedora/server/storage/service/MmapMethodParmDef.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/MmapMethodParmDef.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/MmapMethodParmDef.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/MmapParser.java b/fcrepo-server/src/main/java/fedora/server/storage/service/MmapParser.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/MmapParser.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/MmapParser.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/Part.java b/fcrepo-server/src/main/java/fedora/server/storage/service/Part.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/Part.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/Part.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/Port.java b/fcrepo-server/src/main/java/fedora/server/storage/service/Port.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/Port.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/Port.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/PortType.java b/fcrepo-server/src/main/java/fedora/server/storage/service/PortType.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/PortType.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/PortType.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/SOAPBinding.java b/fcrepo-server/src/main/java/fedora/server/storage/service/SOAPBinding.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/SOAPBinding.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/SOAPBinding.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/SOAPOperation.java b/fcrepo-server/src/main/java/fedora/server/storage/service/SOAPOperation.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/SOAPOperation.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/SOAPOperation.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/Service.java b/fcrepo-server/src/main/java/fedora/server/storage/service/Service.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/Service.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/Service.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/ServiceMapper.java b/fcrepo-server/src/main/java/fedora/server/storage/service/ServiceMapper.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/ServiceMapper.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/ServiceMapper.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/SimpleType.java b/fcrepo-server/src/main/java/fedora/server/storage/service/SimpleType.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/SimpleType.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/SimpleType.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/Type.java b/fcrepo-server/src/main/java/fedora/server/storage/service/Type.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/Type.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/Type.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/service/WSDLParser.java b/fcrepo-server/src/main/java/fedora/server/storage/service/WSDLParser.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/service/WSDLParser.java rename to fcrepo-server/src/main/java/fedora/server/storage/service/WSDLParser.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/Atom1_1DODeserializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/Atom1_1DODeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/Atom1_1DODeserializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/Atom1_1DODeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/Atom1_1DOSerializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/Atom1_1DOSerializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/Atom1_1DOSerializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/Atom1_1DOSerializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/AtomDODeserializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/AtomDODeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/AtomDODeserializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/AtomDODeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/AtomDOSerializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/AtomDOSerializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/AtomDOSerializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/AtomDOSerializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/AtomZip1_1DODeserializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/AtomZip1_1DODeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/AtomZip1_1DODeserializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/AtomZip1_1DODeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/AtomZip1_1DOSerializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/AtomZip1_1DOSerializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/AtomZip1_1DOSerializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/AtomZip1_1DOSerializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/ConvertObjectSerialization.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/ConvertObjectSerialization.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/ConvertObjectSerialization.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/ConvertObjectSerialization.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/DODeserializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/DODeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/DODeserializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/DODeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/DOSerializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/DOSerializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/DOSerializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/DOSerializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/DOTranslationUtility.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/DOTranslationUtility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/DOTranslationUtility.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/DOTranslationUtility.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/DOTranslator.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/DOTranslator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/DOTranslator.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/DOTranslator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/DOTranslatorImpl.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/DOTranslatorImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/DOTranslatorImpl.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/DOTranslatorImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/DOTranslatorModule.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/DOTranslatorModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/DOTranslatorModule.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/DOTranslatorModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXML1_0DODeserializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/FOXML1_0DODeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXML1_0DODeserializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/FOXML1_0DODeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXML1_0DOSerializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/FOXML1_0DOSerializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXML1_0DOSerializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/FOXML1_0DOSerializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXML1_1DODeserializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/FOXML1_1DODeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXML1_1DODeserializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/FOXML1_1DODeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXML1_1DOSerializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/FOXML1_1DOSerializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXML1_1DOSerializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/FOXML1_1DOSerializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXMLDODeserializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/FOXMLDODeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXMLDODeserializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/FOXMLDODeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXMLDOSerializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/FOXMLDOSerializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/FOXMLDOSerializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/FOXMLDOSerializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_0DODeserializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_0DODeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_0DODeserializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_0DODeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_0DOSerializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_0DOSerializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_0DOSerializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_0DOSerializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_1DODeserializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_1DODeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_1DODeserializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_1DODeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_1DOSerializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_1DOSerializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_1DOSerializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExt1_1DOSerializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExtDODeserializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExtDODeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExtDODeserializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExtDODeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExtDOSerializer.java b/fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExtDOSerializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExtDOSerializer.java rename to fcrepo-server/src/main/java/fedora/server/storage/translation/METSFedoraExtDOSerializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/AuditRecord.java b/fcrepo-server/src/main/java/fedora/server/storage/types/AuditRecord.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/AuditRecord.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/AuditRecord.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/BasicDigitalObject.java b/fcrepo-server/src/main/java/fedora/server/storage/types/BasicDigitalObject.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/BasicDigitalObject.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/BasicDigitalObject.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DSBinding.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DSBinding.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DSBinding.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DSBinding.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DSBindingMap.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DSBindingMap.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DSBindingMap.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DSBindingMap.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/Datastream.java b/fcrepo-server/src/main/java/fedora/server/storage/types/Datastream.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/Datastream.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/Datastream.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DatastreamDef.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DatastreamDef.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DatastreamDef.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DatastreamDef.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DatastreamManagedContent.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DatastreamManagedContent.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DatastreamManagedContent.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DatastreamManagedContent.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DatastreamMediation.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DatastreamMediation.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DatastreamMediation.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DatastreamMediation.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DatastreamReferencedContent.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DatastreamReferencedContent.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DatastreamReferencedContent.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DatastreamReferencedContent.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DatastreamXMLMetadata.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DatastreamXMLMetadata.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DatastreamXMLMetadata.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DatastreamXMLMetadata.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DeploymentDSBindRule.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DeploymentDSBindRule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DeploymentDSBindRule.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DeploymentDSBindRule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DeploymentDSBindSpec.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DeploymentDSBindSpec.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DeploymentDSBindSpec.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DeploymentDSBindSpec.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DigitalObject.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DigitalObject.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DigitalObject.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DigitalObject.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DigitalObjectUtil.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DigitalObjectUtil.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DigitalObjectUtil.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DigitalObjectUtil.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/DisseminationBindingInfo.java b/fcrepo-server/src/main/java/fedora/server/storage/types/DisseminationBindingInfo.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/DisseminationBindingInfo.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/DisseminationBindingInfo.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/Disseminator.java b/fcrepo-server/src/main/java/fedora/server/storage/types/Disseminator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/Disseminator.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/Disseminator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/MIMETypedStream.java b/fcrepo-server/src/main/java/fedora/server/storage/types/MIMETypedStream.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/MIMETypedStream.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/MIMETypedStream.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/MethodDef.java b/fcrepo-server/src/main/java/fedora/server/storage/types/MethodDef.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/MethodDef.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/MethodDef.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/MethodDefOperationBind.java b/fcrepo-server/src/main/java/fedora/server/storage/types/MethodDefOperationBind.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/MethodDefOperationBind.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/MethodDefOperationBind.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/MethodParmDef.java b/fcrepo-server/src/main/java/fedora/server/storage/types/MethodParmDef.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/MethodParmDef.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/MethodParmDef.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/ObjectMethodsDef.java b/fcrepo-server/src/main/java/fedora/server/storage/types/ObjectMethodsDef.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/ObjectMethodsDef.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/ObjectMethodsDef.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/Property.java b/fcrepo-server/src/main/java/fedora/server/storage/types/Property.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/Property.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/Property.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/RelationshipTuple.java b/fcrepo-server/src/main/java/fedora/server/storage/types/RelationshipTuple.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/RelationshipTuple.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/RelationshipTuple.java diff --git a/fedorarepo-server/src/main/java/fedora/server/storage/types/TupleArrayTripleIterator.java b/fcrepo-server/src/main/java/fedora/server/storage/types/TupleArrayTripleIterator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/storage/types/TupleArrayTripleIterator.java rename to fcrepo-server/src/main/java/fedora/server/storage/types/TupleArrayTripleIterator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/test/DigitalObjectTest.java b/fcrepo-server/src/main/java/fedora/server/test/DigitalObjectTest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/test/DigitalObjectTest.java rename to fcrepo-server/src/main/java/fedora/server/test/DigitalObjectTest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/test/FOXMLInOutTest.java b/fcrepo-server/src/main/java/fedora/server/test/FOXMLInOutTest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/test/FOXMLInOutTest.java rename to fcrepo-server/src/main/java/fedora/server/test/FOXMLInOutTest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/test/JournalBase64Test.java b/fcrepo-server/src/main/java/fedora/server/test/JournalBase64Test.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/test/JournalBase64Test.java rename to fcrepo-server/src/main/java/fedora/server/test/JournalBase64Test.java diff --git a/fedorarepo-server/src/main/java/fedora/server/test/METSInOutTest.java b/fcrepo-server/src/main/java/fedora/server/test/METSInOutTest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/test/METSInOutTest.java rename to fcrepo-server/src/main/java/fedora/server/test/METSInOutTest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/test/RepositoryReaderTest.java b/fcrepo-server/src/main/java/fedora/server/test/RepositoryReaderTest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/test/RepositoryReaderTest.java rename to fcrepo-server/src/main/java/fedora/server/test/RepositoryReaderTest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/test/TestClientAPIA.java b/fcrepo-server/src/main/java/fedora/server/test/TestClientAPIA.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/test/TestClientAPIA.java rename to fcrepo-server/src/main/java/fedora/server/test/TestClientAPIA.java diff --git a/fedorarepo-server/src/main/java/fedora/server/test/TranslatorTest.java b/fcrepo-server/src/main/java/fedora/server/test/TranslatorTest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/test/TranslatorTest.java rename to fcrepo-server/src/main/java/fedora/server/test/TranslatorTest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/test/ValidateSchematronTest.java b/fcrepo-server/src/main/java/fedora/server/test/ValidateSchematronTest.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/test/ValidateSchematronTest.java rename to fcrepo-server/src/main/java/fedora/server/test/ValidateSchematronTest.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/AxisUtility.java b/fcrepo-server/src/main/java/fedora/server/utilities/AxisUtility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/AxisUtility.java rename to fcrepo-server/src/main/java/fedora/server/utilities/AxisUtility.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/CleanupContextListener.java b/fcrepo-server/src/main/java/fedora/server/utilities/CleanupContextListener.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/CleanupContextListener.java rename to fcrepo-server/src/main/java/fedora/server/utilities/CleanupContextListener.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/ColumnSpec.java b/fcrepo-server/src/main/java/fedora/server/utilities/ColumnSpec.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/ColumnSpec.java rename to fcrepo-server/src/main/java/fedora/server/utilities/ColumnSpec.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/ConnectionWrapper.java b/fcrepo-server/src/main/java/fedora/server/utilities/ConnectionWrapper.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/ConnectionWrapper.java rename to fcrepo-server/src/main/java/fedora/server/utilities/ConnectionWrapper.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/DCField.java b/fcrepo-server/src/main/java/fedora/server/utilities/DCField.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/DCField.java rename to fcrepo-server/src/main/java/fedora/server/utilities/DCField.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/DCFields.java b/fcrepo-server/src/main/java/fedora/server/utilities/DCFields.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/DCFields.java rename to fcrepo-server/src/main/java/fedora/server/utilities/DCFields.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/DDLConverter.java b/fcrepo-server/src/main/java/fedora/server/utilities/DDLConverter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/DDLConverter.java rename to fcrepo-server/src/main/java/fedora/server/utilities/DDLConverter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/DateUtility.java b/fcrepo-server/src/main/java/fedora/server/utilities/DateUtility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/DateUtility.java rename to fcrepo-server/src/main/java/fedora/server/utilities/DateUtility.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/DerbyDDLConverter.java b/fcrepo-server/src/main/java/fedora/server/utilities/DerbyDDLConverter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/DerbyDDLConverter.java rename to fcrepo-server/src/main/java/fedora/server/utilities/DerbyDDLConverter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/FilteredTripleIterator.java b/fcrepo-server/src/main/java/fedora/server/utilities/FilteredTripleIterator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/FilteredTripleIterator.java rename to fcrepo-server/src/main/java/fedora/server/utilities/FilteredTripleIterator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/Log4jConfigListener.java b/fcrepo-server/src/main/java/fedora/server/utilities/Log4jConfigListener.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/Log4jConfigListener.java rename to fcrepo-server/src/main/java/fedora/server/utilities/Log4jConfigListener.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/MD5Utility.java b/fcrepo-server/src/main/java/fedora/server/utilities/MD5Utility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/MD5Utility.java rename to fcrepo-server/src/main/java/fedora/server/utilities/MD5Utility.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/McKoiDDLConverter.java b/fcrepo-server/src/main/java/fedora/server/utilities/McKoiDDLConverter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/McKoiDDLConverter.java rename to fcrepo-server/src/main/java/fedora/server/utilities/McKoiDDLConverter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/MethodInvokerThread.java b/fcrepo-server/src/main/java/fedora/server/utilities/MethodInvokerThread.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/MethodInvokerThread.java rename to fcrepo-server/src/main/java/fedora/server/utilities/MethodInvokerThread.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/MsSQLDDLConverter.java b/fcrepo-server/src/main/java/fedora/server/utilities/MsSQLDDLConverter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/MsSQLDDLConverter.java rename to fcrepo-server/src/main/java/fedora/server/utilities/MsSQLDDLConverter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/MySQLDDLConverter.java b/fcrepo-server/src/main/java/fedora/server/utilities/MySQLDDLConverter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/MySQLDDLConverter.java rename to fcrepo-server/src/main/java/fedora/server/utilities/MySQLDDLConverter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/OracleDDLConverter.java b/fcrepo-server/src/main/java/fedora/server/utilities/OracleDDLConverter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/OracleDDLConverter.java rename to fcrepo-server/src/main/java/fedora/server/utilities/OracleDDLConverter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/ParserUtilityHandler.java b/fcrepo-server/src/main/java/fedora/server/utilities/ParserUtilityHandler.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/ParserUtilityHandler.java rename to fcrepo-server/src/main/java/fedora/server/utilities/ParserUtilityHandler.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/PostgresDDLConverter.java b/fcrepo-server/src/main/java/fedora/server/utilities/PostgresDDLConverter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/PostgresDDLConverter.java rename to fcrepo-server/src/main/java/fedora/server/utilities/PostgresDDLConverter.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/ProtocolPort.java b/fcrepo-server/src/main/java/fedora/server/utilities/ProtocolPort.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/ProtocolPort.java rename to fcrepo-server/src/main/java/fedora/server/utilities/ProtocolPort.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/RuntimeWSDL.java b/fcrepo-server/src/main/java/fedora/server/utilities/RuntimeWSDL.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/RuntimeWSDL.java rename to fcrepo-server/src/main/java/fedora/server/utilities/RuntimeWSDL.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/SQLUtility.java b/fcrepo-server/src/main/java/fedora/server/utilities/SQLUtility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/SQLUtility.java rename to fcrepo-server/src/main/java/fedora/server/utilities/SQLUtility.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/SQLUtilityImpl.java b/fcrepo-server/src/main/java/fedora/server/utilities/SQLUtilityImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/SQLUtilityImpl.java rename to fcrepo-server/src/main/java/fedora/server/utilities/SQLUtilityImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/ServerUtility.java b/fcrepo-server/src/main/java/fedora/server/utilities/ServerUtility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/ServerUtility.java rename to fcrepo-server/src/main/java/fedora/server/utilities/ServerUtility.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/StreamUtility.java b/fcrepo-server/src/main/java/fedora/server/utilities/StreamUtility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/StreamUtility.java rename to fcrepo-server/src/main/java/fedora/server/utilities/StreamUtility.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/StringUtility.java b/fcrepo-server/src/main/java/fedora/server/utilities/StringUtility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/StringUtility.java rename to fcrepo-server/src/main/java/fedora/server/utilities/StringUtility.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/TableCreatingConnection.java b/fcrepo-server/src/main/java/fedora/server/utilities/TableCreatingConnection.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/TableCreatingConnection.java rename to fcrepo-server/src/main/java/fedora/server/utilities/TableCreatingConnection.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/TableSpec.java b/fcrepo-server/src/main/java/fedora/server/utilities/TableSpec.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/TableSpec.java rename to fcrepo-server/src/main/java/fedora/server/utilities/TableSpec.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/TableSpecDeserializer.java b/fcrepo-server/src/main/java/fedora/server/utilities/TableSpecDeserializer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/TableSpecDeserializer.java rename to fcrepo-server/src/main/java/fedora/server/utilities/TableSpecDeserializer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/ThreadMonitor.java b/fcrepo-server/src/main/java/fedora/server/utilities/ThreadMonitor.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/ThreadMonitor.java rename to fcrepo-server/src/main/java/fedora/server/utilities/ThreadMonitor.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/ThreadMonitorImpl.java b/fcrepo-server/src/main/java/fedora/server/utilities/ThreadMonitorImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/ThreadMonitorImpl.java rename to fcrepo-server/src/main/java/fedora/server/utilities/ThreadMonitorImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/ThreadMonitorModule.java b/fcrepo-server/src/main/java/fedora/server/utilities/ThreadMonitorModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/ThreadMonitorModule.java rename to fcrepo-server/src/main/java/fedora/server/utilities/ThreadMonitorModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/TypeUtility.java b/fcrepo-server/src/main/java/fedora/server/utilities/TypeUtility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/TypeUtility.java rename to fcrepo-server/src/main/java/fedora/server/utilities/TypeUtility.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/rebuild/Rebuild.java b/fcrepo-server/src/main/java/fedora/server/utilities/rebuild/Rebuild.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/rebuild/Rebuild.java rename to fcrepo-server/src/main/java/fedora/server/utilities/rebuild/Rebuild.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/rebuild/RebuildDOManager.java b/fcrepo-server/src/main/java/fedora/server/utilities/rebuild/RebuildDOManager.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/rebuild/RebuildDOManager.java rename to fcrepo-server/src/main/java/fedora/server/utilities/rebuild/RebuildDOManager.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/rebuild/RebuildServer.java b/fcrepo-server/src/main/java/fedora/server/utilities/rebuild/RebuildServer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/rebuild/RebuildServer.java rename to fcrepo-server/src/main/java/fedora/server/utilities/rebuild/RebuildServer.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/rebuild/Rebuilder.java b/fcrepo-server/src/main/java/fedora/server/utilities/rebuild/Rebuilder.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/rebuild/Rebuilder.java rename to fcrepo-server/src/main/java/fedora/server/utilities/rebuild/Rebuilder.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/rebuild/SQLRebuilder.java b/fcrepo-server/src/main/java/fedora/server/utilities/rebuild/SQLRebuilder.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/rebuild/SQLRebuilder.java rename to fcrepo-server/src/main/java/fedora/server/utilities/rebuild/SQLRebuilder.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/status/ServerState.java b/fcrepo-server/src/main/java/fedora/server/utilities/status/ServerState.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/status/ServerState.java rename to fcrepo-server/src/main/java/fedora/server/utilities/status/ServerState.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/status/ServerStatusFile.java b/fcrepo-server/src/main/java/fedora/server/utilities/status/ServerStatusFile.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/status/ServerStatusFile.java rename to fcrepo-server/src/main/java/fedora/server/utilities/status/ServerStatusFile.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/status/ServerStatusMessage.java b/fcrepo-server/src/main/java/fedora/server/utilities/status/ServerStatusMessage.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/status/ServerStatusMessage.java rename to fcrepo-server/src/main/java/fedora/server/utilities/status/ServerStatusMessage.java diff --git a/fedorarepo-server/src/main/java/fedora/server/utilities/status/ServerStatusTool.java b/fcrepo-server/src/main/java/fedora/server/utilities/status/ServerStatusTool.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/utilities/status/ServerStatusTool.java rename to fcrepo-server/src/main/java/fedora/server/utilities/status/ServerStatusTool.java diff --git a/fedorarepo-server/src/main/java/fedora/server/validation/DOValidator.java b/fcrepo-server/src/main/java/fedora/server/validation/DOValidator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/validation/DOValidator.java rename to fcrepo-server/src/main/java/fedora/server/validation/DOValidator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorImpl.java b/fcrepo-server/src/main/java/fedora/server/validation/DOValidatorImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorImpl.java rename to fcrepo-server/src/main/java/fedora/server/validation/DOValidatorImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorModule.java b/fcrepo-server/src/main/java/fedora/server/validation/DOValidatorModule.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorModule.java rename to fcrepo-server/src/main/java/fedora/server/validation/DOValidatorModule.java diff --git a/fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorSchematron.java b/fcrepo-server/src/main/java/fedora/server/validation/DOValidatorSchematron.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorSchematron.java rename to fcrepo-server/src/main/java/fedora/server/validation/DOValidatorSchematron.java diff --git a/fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorSchematronResult.java b/fcrepo-server/src/main/java/fedora/server/validation/DOValidatorSchematronResult.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorSchematronResult.java rename to fcrepo-server/src/main/java/fedora/server/validation/DOValidatorSchematronResult.java diff --git a/fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorXMLErrorHandler.java b/fcrepo-server/src/main/java/fedora/server/validation/DOValidatorXMLErrorHandler.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorXMLErrorHandler.java rename to fcrepo-server/src/main/java/fedora/server/validation/DOValidatorXMLErrorHandler.java diff --git a/fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorXMLSchema.java b/fcrepo-server/src/main/java/fedora/server/validation/DOValidatorXMLSchema.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/validation/DOValidatorXMLSchema.java rename to fcrepo-server/src/main/java/fedora/server/validation/DOValidatorXMLSchema.java diff --git a/fedorarepo-server/src/main/java/fedora/server/validation/RelsValidator.java b/fcrepo-server/src/main/java/fedora/server/validation/RelsValidator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/validation/RelsValidator.java rename to fcrepo-server/src/main/java/fedora/server/validation/RelsValidator.java diff --git a/fedorarepo-server/src/main/java/fedora/server/validation/ValidationConstants.java b/fcrepo-server/src/main/java/fedora/server/validation/ValidationConstants.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/validation/ValidationConstants.java rename to fcrepo-server/src/main/java/fedora/server/validation/ValidationConstants.java diff --git a/fedorarepo-server/src/main/java/fedora/server/validation/ValidationUtility.java b/fcrepo-server/src/main/java/fedora/server/validation/ValidationUtility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/server/validation/ValidationUtility.java rename to fcrepo-server/src/main/java/fedora/server/validation/ValidationUtility.java diff --git a/fedorarepo-server/src/main/java/fedora/soapclient/FedoraAccessSoapServlet.java b/fcrepo-server/src/main/java/fedora/soapclient/FedoraAccessSoapServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/soapclient/FedoraAccessSoapServlet.java rename to fcrepo-server/src/main/java/fedora/soapclient/FedoraAccessSoapServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/soapclient/MethodParameterResolverServlet.java b/fcrepo-server/src/main/java/fedora/soapclient/MethodParameterResolverServlet.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/soapclient/MethodParameterResolverServlet.java rename to fcrepo-server/src/main/java/fedora/soapclient/MethodParameterResolverServlet.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/Base64.java b/fcrepo-server/src/main/java/fedora/utilities/Base64.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/Base64.java rename to fcrepo-server/src/main/java/fedora/utilities/Base64.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/DriverShim.java b/fcrepo-server/src/main/java/fedora/utilities/DriverShim.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/DriverShim.java rename to fcrepo-server/src/main/java/fedora/utilities/DriverShim.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/ExecUtility.java b/fcrepo-server/src/main/java/fedora/utilities/ExecUtility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/ExecUtility.java rename to fcrepo-server/src/main/java/fedora/utilities/ExecUtility.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/FileComparator.java b/fcrepo-server/src/main/java/fedora/utilities/FileComparator.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/FileComparator.java rename to fcrepo-server/src/main/java/fedora/utilities/FileComparator.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/FileUtils.java b/fcrepo-server/src/main/java/fedora/utilities/FileUtils.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/FileUtils.java rename to fcrepo-server/src/main/java/fedora/utilities/FileUtils.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/Foxml11Document.java b/fcrepo-server/src/main/java/fedora/utilities/Foxml11Document.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/Foxml11Document.java rename to fcrepo-server/src/main/java/fedora/utilities/Foxml11Document.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/Log4J.java b/fcrepo-server/src/main/java/fedora/utilities/Log4J.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/Log4J.java rename to fcrepo-server/src/main/java/fedora/utilities/Log4J.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/Log4JRedirectFilter.java b/fcrepo-server/src/main/java/fedora/utilities/Log4JRedirectFilter.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/Log4JRedirectFilter.java rename to fcrepo-server/src/main/java/fedora/utilities/Log4JRedirectFilter.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/MakePatch.java b/fcrepo-server/src/main/java/fedora/utilities/MakePatch.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/MakePatch.java rename to fcrepo-server/src/main/java/fedora/utilities/MakePatch.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/MimeTypeUtils.java b/fcrepo-server/src/main/java/fedora/utilities/MimeTypeUtils.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/MimeTypeUtils.java rename to fcrepo-server/src/main/java/fedora/utilities/MimeTypeUtils.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/NamespaceContextImpl.java b/fcrepo-server/src/main/java/fedora/utilities/NamespaceContextImpl.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/NamespaceContextImpl.java rename to fcrepo-server/src/main/java/fedora/utilities/NamespaceContextImpl.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/NormalizedURI.java b/fcrepo-server/src/main/java/fedora/utilities/NormalizedURI.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/NormalizedURI.java rename to fcrepo-server/src/main/java/fedora/utilities/NormalizedURI.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/StreamReaderThread.java b/fcrepo-server/src/main/java/fedora/utilities/StreamReaderThread.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/StreamReaderThread.java rename to fcrepo-server/src/main/java/fedora/utilities/StreamReaderThread.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/XMLDocument.java b/fcrepo-server/src/main/java/fedora/utilities/XMLDocument.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/XMLDocument.java rename to fcrepo-server/src/main/java/fedora/utilities/XMLDocument.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/XmlTransformUtility.java b/fcrepo-server/src/main/java/fedora/utilities/XmlTransformUtility.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/XmlTransformUtility.java rename to fcrepo-server/src/main/java/fedora/utilities/XmlTransformUtility.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/Zip.java b/fcrepo-server/src/main/java/fedora/utilities/Zip.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/Zip.java rename to fcrepo-server/src/main/java/fedora/utilities/Zip.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/ClassLoaderDistribution.java b/fcrepo-server/src/main/java/fedora/utilities/install/ClassLoaderDistribution.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/ClassLoaderDistribution.java rename to fcrepo-server/src/main/java/fedora/utilities/install/ClassLoaderDistribution.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/Database.java b/fcrepo-server/src/main/java/fedora/utilities/install/Database.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/Database.java rename to fcrepo-server/src/main/java/fedora/utilities/install/Database.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/Distribution.java b/fcrepo-server/src/main/java/fedora/utilities/install/Distribution.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/Distribution.java rename to fcrepo-server/src/main/java/fedora/utilities/install/Distribution.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/FedoraHome.java b/fcrepo-server/src/main/java/fedora/utilities/install/FedoraHome.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/FedoraHome.java rename to fcrepo-server/src/main/java/fedora/utilities/install/FedoraHome.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/InstallOptions.java b/fcrepo-server/src/main/java/fedora/utilities/install/InstallOptions.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/InstallOptions.java rename to fcrepo-server/src/main/java/fedora/utilities/install/InstallOptions.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/InstallationCancelledException.java b/fcrepo-server/src/main/java/fedora/utilities/install/InstallationCancelledException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/InstallationCancelledException.java rename to fcrepo-server/src/main/java/fedora/utilities/install/InstallationCancelledException.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/InstallationFailedException.java b/fcrepo-server/src/main/java/fedora/utilities/install/InstallationFailedException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/InstallationFailedException.java rename to fcrepo-server/src/main/java/fedora/utilities/install/InstallationFailedException.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/Installer.java b/fcrepo-server/src/main/java/fedora/utilities/install/Installer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/Installer.java rename to fcrepo-server/src/main/java/fedora/utilities/install/Installer.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/OptionDefinition.java b/fcrepo-server/src/main/java/fedora/utilities/install/OptionDefinition.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/OptionDefinition.java rename to fcrepo-server/src/main/java/fedora/utilities/install/OptionDefinition.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/OptionValidationException.java b/fcrepo-server/src/main/java/fedora/utilities/install/OptionValidationException.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/OptionValidationException.java rename to fcrepo-server/src/main/java/fedora/utilities/install/OptionValidationException.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/container/BundledTomcat.java b/fcrepo-server/src/main/java/fedora/utilities/install/container/BundledTomcat.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/container/BundledTomcat.java rename to fcrepo-server/src/main/java/fedora/utilities/install/container/BundledTomcat.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/container/Container.java b/fcrepo-server/src/main/java/fedora/utilities/install/container/Container.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/container/Container.java rename to fcrepo-server/src/main/java/fedora/utilities/install/container/Container.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/container/ContainerFactory.java b/fcrepo-server/src/main/java/fedora/utilities/install/container/ContainerFactory.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/container/ContainerFactory.java rename to fcrepo-server/src/main/java/fedora/utilities/install/container/ContainerFactory.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/container/DefaultContainer.java b/fcrepo-server/src/main/java/fedora/utilities/install/container/DefaultContainer.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/container/DefaultContainer.java rename to fcrepo-server/src/main/java/fedora/utilities/install/container/DefaultContainer.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/container/ExistingTomcat.java b/fcrepo-server/src/main/java/fedora/utilities/install/container/ExistingTomcat.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/container/ExistingTomcat.java rename to fcrepo-server/src/main/java/fedora/utilities/install/container/ExistingTomcat.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/container/ExistingTomcat50.java b/fcrepo-server/src/main/java/fedora/utilities/install/container/ExistingTomcat50.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/container/ExistingTomcat50.java rename to fcrepo-server/src/main/java/fedora/utilities/install/container/ExistingTomcat50.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/container/FedoraWebXML.java b/fcrepo-server/src/main/java/fedora/utilities/install/container/FedoraWebXML.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/container/FedoraWebXML.java rename to fcrepo-server/src/main/java/fedora/utilities/install/container/FedoraWebXML.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/container/Tomcat.java b/fcrepo-server/src/main/java/fedora/utilities/install/container/Tomcat.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/container/Tomcat.java rename to fcrepo-server/src/main/java/fedora/utilities/install/container/Tomcat.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/container/TomcatServerXML.java b/fcrepo-server/src/main/java/fedora/utilities/install/container/TomcatServerXML.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/container/TomcatServerXML.java rename to fcrepo-server/src/main/java/fedora/utilities/install/container/TomcatServerXML.java diff --git a/fedorarepo-server/src/main/java/fedora/utilities/install/container/WebXMLOptions.java b/fcrepo-server/src/main/java/fedora/utilities/install/container/WebXMLOptions.java similarity index 100% rename from fedorarepo-server/src/main/java/fedora/utilities/install/container/WebXMLOptions.java rename to fcrepo-server/src/main/java/fedora/utilities/install/container/WebXMLOptions.java diff --git a/fedorarepo-server/src/main/resources/assemblies/rmi-journal-recv-jar.xml b/fcrepo-server/src/main/resources/assemblies/rmi-journal-recv-jar.xml similarity index 84% rename from fedorarepo-server/src/main/resources/assemblies/rmi-journal-recv-jar.xml rename to fcrepo-server/src/main/resources/assemblies/rmi-journal-recv-jar.xml index 0f12f9ead..f4b06b1d9 100644 --- a/fedorarepo-server/src/main/resources/assemblies/rmi-journal-recv-jar.xml +++ b/fcrepo-server/src/main/resources/assemblies/rmi-journal-recv-jar.xml @@ -9,7 +9,7 @@ - org.fedorarepo:fedorarepo-server:jar:rmi-journal-recv-main:${project.version} + org.fcrepo:fcrepo-server:jar:rmi-journal-recv-main:${project.version} /main main.jar @@ -29,7 +29,7 @@ - org.fedorarepo:one-jar-boot:jar:0.96 + org.fcrepo:one-jar-boot:jar:0.96 true diff --git a/fedorarepo-server/src/main/resources/assemblies/rmi-journal-recv-zip.xml b/fcrepo-server/src/main/resources/assemblies/rmi-journal-recv-zip.xml similarity index 81% rename from fedorarepo-server/src/main/resources/assemblies/rmi-journal-recv-zip.xml rename to fcrepo-server/src/main/resources/assemblies/rmi-journal-recv-zip.xml index 94652959d..5d9a90703 100644 --- a/fedorarepo-server/src/main/resources/assemblies/rmi-journal-recv-zip.xml +++ b/fcrepo-server/src/main/resources/assemblies/rmi-journal-recv-zip.xml @@ -17,7 +17,7 @@ - org.fedorarepo:fedorarepo-server:jar:rmi-journal-recv:${project.version} + org.fcrepo:fcrepo-server:jar:rmi-journal-recv:${project.version} true diff --git a/fedorarepo-server/src/main/resources/dbspec/server/fedora/server/storage/resources/DefaultDOManager.dbspec b/fcrepo-server/src/main/resources/dbspec/server/fedora/server/storage/resources/DefaultDOManager.dbspec similarity index 100% rename from fedorarepo-server/src/main/resources/dbspec/server/fedora/server/storage/resources/DefaultDOManager.dbspec rename to fcrepo-server/src/main/resources/dbspec/server/fedora/server/storage/resources/DefaultDOManager.dbspec diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/batch-demo/foxml-template.xml b/fcrepo-server/src/main/resources/demo/demo-objects/batch-demo/foxml-template.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/batch-demo/foxml-template.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/batch-demo/foxml-template.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/batch-demo/mets-template.xml b/fcrepo-server/src/main/resources/demo/demo-objects/batch-demo/mets-template.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/batch-demo/mets-template.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/batch-demo/mets-template.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/batch-demo/modify-batch-directives.xml b/fcrepo-server/src/main/resources/demo/demo-objects/batch-demo/modify-batch-directives.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/batch-demo/modify-batch-directives.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/batch-demo/modify-batch-directives.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/demo_XML_TO_HTMLDOC.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/demo_XML_TO_HTMLDOC.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/demo_XML_TO_HTMLDOC.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/demo_XML_TO_HTMLDOC.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/obj_demo_14.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/obj_demo_14.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/obj_demo_14.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/obj_demo_14.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/sdef_demo_12.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/sdef_demo_12.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/sdef_demo_12.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/sdef_demo_12.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/sdep_demo_13.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/sdep_demo_13.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/sdep_demo_13.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/document-transform-demo/sdep_demo_13.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/cmodel_demo_FO_TO_PDFDOC.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/cmodel_demo_FO_TO_PDFDOC.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/cmodel_demo_FO_TO_PDFDOC.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/cmodel_demo_FO_TO_PDFDOC.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/cmodel_demo_TEI_TO_PDFDOC.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/cmodel_demo_TEI_TO_PDFDOC.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/cmodel_demo_TEI_TO_PDFDOC.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/cmodel_demo_TEI_TO_PDFDOC.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/obj_demo_21.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/obj_demo_21.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/obj_demo_21.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/obj_demo_21.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/obj_demo_26.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/obj_demo_26.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/obj_demo_26.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/obj_demo_26.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdef_demo_19.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdef_demo_19.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdef_demo_19.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdef_demo_19.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdef_demo_22.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdef_demo_22.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdef_demo_22.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdef_demo_22.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdep_demo_20.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdep_demo_20.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdep_demo_20.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdep_demo_20.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdep_demo_25.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdep_demo_25.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdep_demo_25.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/formatting-objects-demo/sdep_demo_25.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImage.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImage.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImage.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImage.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImageCollection.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImageCollection.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImageCollection.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImageCollection.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyBeerGlass.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyBeerGlass.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyBeerGlass.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyBeerGlass.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyBucket.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyBucket.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyBucket.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyBucket.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyDinnerware.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyDinnerware.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyDinnerware.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyDinnerware.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyEarring.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyEarring.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyEarring.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyEarring.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyGreetingCard.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyGreetingCard.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyGreetingCard.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyGreetingCard.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyKeychain.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyKeychain.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyKeychain.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyKeychain.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyNightlight.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyNightlight.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyNightlight.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyNightlight.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyPens.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyPens.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyPens.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyPens.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyShortRoundCup.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyShortRoundCup.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyShortRoundCup.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyShortRoundCup.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyStuff.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyStuff.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyStuff.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyStuff.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyTallRoundCup.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyTallRoundCup.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyTallRoundCup.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyTallRoundCup.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyToiletBrush.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyToiletBrush.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyToiletBrush.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyToiletBrush.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyWastebasket.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyWastebasket.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyWastebasket.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/dataObjects/demo_SmileyWastebasket.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_Collection.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_Collection.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_Collection.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_Collection.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_DualResolution.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_DualResolution.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_DualResolution.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_DualResolution.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_CollectionImpl.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_CollectionImpl.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_CollectionImpl.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_CollectionImpl.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_DualResImageImpl.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_DualResImageImpl.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_DualResImageImpl.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_DualResImageImpl.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/demo_UVA_STD_IMAGE.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/demo_UVA_STD_IMAGE.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/demo_UVA_STD_IMAGE.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/demo_UVA_STD_IMAGE.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/obj_demo_29.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/obj_demo_29.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/obj_demo_29.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/obj_demo_29.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/sdef_demo_27.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/sdef_demo_27.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/sdef_demo_27.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/sdef_demo_27.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/sdep_demo_28.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/sdep_demo_28.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/sdep_demo_28.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/image-manip-demo/sdep_demo_28.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-document-demo/obj_demo_18.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-document-demo/obj_demo_18.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-document-demo/obj_demo_18.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-document-demo/obj_demo_18.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-document-demo/obj_demo_31.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-document-demo/obj_demo_31.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-document-demo/obj_demo_31.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-document-demo/obj_demo_31.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/demo_UVA_STD_IMAGE_1.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/demo_UVA_STD_IMAGE_1.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/demo_UVA_STD_IMAGE_1.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/demo_UVA_STD_IMAGE_1.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/obj_demo_5.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/obj_demo_5.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/obj_demo_5.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/obj_demo_5.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/sdef_demo_1.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/sdef_demo_1.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/sdef_demo_1.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/sdef_demo_1.xml diff --git a/fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/sdep_demo_2.xml b/fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/sdep_demo_2.xml similarity index 100% rename from fedorarepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/sdep_demo_2.xml rename to fcrepo-server/src/main/resources/demo/demo-objects/foxml/local-server-demos/simple-image-demo/sdep_demo_2.xml diff --git a/fedorarepo-server/src/main/resources/fcfg/server/.cvsignore b/fcrepo-server/src/main/resources/fcfg/server/.cvsignore similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/.cvsignore rename to fcrepo-server/src/main/resources/fcfg/server/.cvsignore diff --git a/fedorarepo-server/src/main/resources/fcfg/server/akubra-llstore.xml b/fcrepo-server/src/main/resources/fcfg/server/akubra-llstore.xml similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/akubra-llstore.xml rename to fcrepo-server/src/main/resources/fcfg/server/akubra-llstore.xml diff --git a/fedorarepo-server/src/main/resources/fcfg/server/beSecurity-secure-all.xml b/fcrepo-server/src/main/resources/fcfg/server/beSecurity-secure-all.xml similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/beSecurity-secure-all.xml rename to fcrepo-server/src/main/resources/fcfg/server/beSecurity-secure-all.xml diff --git a/fedorarepo-server/src/main/resources/fcfg/server/beSecurity-secure-apim.xml b/fcrepo-server/src/main/resources/fcfg/server/beSecurity-secure-apim.xml similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/beSecurity-secure-apim.xml rename to fcrepo-server/src/main/resources/fcfg/server/beSecurity-secure-apim.xml diff --git a/fedorarepo-server/src/main/resources/fcfg/server/beSecurity-unsecure-all.xml b/fcrepo-server/src/main/resources/fcfg/server/beSecurity-unsecure-all.xml similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/beSecurity-unsecure-all.xml rename to fcrepo-server/src/main/resources/fcfg/server/beSecurity-unsecure-all.xml diff --git a/fedorarepo-server/src/main/resources/fcfg/server/beSecurity-unsecure-apim.xml b/fcrepo-server/src/main/resources/fcfg/server/beSecurity-unsecure-apim.xml similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/beSecurity-unsecure-apim.xml rename to fcrepo-server/src/main/resources/fcfg/server/beSecurity-unsecure-apim.xml diff --git a/fedorarepo-server/src/main/resources/fcfg/server/fedora-base.fcfg b/fcrepo-server/src/main/resources/fcfg/server/fedora-base.fcfg similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/fedora-base.fcfg rename to fcrepo-server/src/main/resources/fcfg/server/fedora-base.fcfg diff --git a/fedorarepo-server/src/main/resources/fcfg/server/fedora-secure-all.properties b/fcrepo-server/src/main/resources/fcfg/server/fedora-secure-all.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/fedora-secure-all.properties rename to fcrepo-server/src/main/resources/fcfg/server/fedora-secure-all.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/fedora-secure-apim.properties b/fcrepo-server/src/main/resources/fcfg/server/fedora-secure-apim.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/fedora-secure-apim.properties rename to fcrepo-server/src/main/resources/fcfg/server/fedora-secure-apim.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/fedora-unsecure-all.properties b/fcrepo-server/src/main/resources/fcfg/server/fedora-unsecure-all.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/fedora-unsecure-all.properties rename to fcrepo-server/src/main/resources/fcfg/server/fedora-unsecure-all.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/fedora-unsecure-apim.properties b/fcrepo-server/src/main/resources/fcfg/server/fedora-unsecure-apim.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/fedora-unsecure-apim.properties rename to fcrepo-server/src/main/resources/fcfg/server/fedora-unsecure-apim.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/fedora-users.xml b/fcrepo-server/src/main/resources/fcfg/server/fedora-users.xml similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/fedora-users.xml rename to fcrepo-server/src/main/resources/fcfg/server/fedora-users.xml diff --git a/fedorarepo-server/src/main/resources/fcfg/server/junit-insecure.properties b/fcrepo-server/src/main/resources/fcfg/server/junit-insecure.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/junit-insecure.properties rename to fcrepo-server/src/main/resources/fcfg/server/junit-insecure.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/junit-mckoi.properties b/fcrepo-server/src/main/resources/fcfg/server/junit-mckoi.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/junit-mckoi.properties rename to fcrepo-server/src/main/resources/fcfg/server/junit-mckoi.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/junit-mediate.properties b/fcrepo-server/src/main/resources/fcfg/server/junit-mediate.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/junit-mediate.properties rename to fcrepo-server/src/main/resources/fcfg/server/junit-mediate.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/junit-mysql.properties b/fcrepo-server/src/main/resources/fcfg/server/junit-mysql.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/junit-mysql.properties rename to fcrepo-server/src/main/resources/fcfg/server/junit-mysql.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/junit-oracle.properties b/fcrepo-server/src/main/resources/fcfg/server/junit-oracle.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/junit-oracle.properties rename to fcrepo-server/src/main/resources/fcfg/server/junit-oracle.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/junit-secure.properties b/fcrepo-server/src/main/resources/fcfg/server/junit-secure.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/junit-secure.properties rename to fcrepo-server/src/main/resources/fcfg/server/junit-secure.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/log4j.properties b/fcrepo-server/src/main/resources/fcfg/server/log4j.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/log4j.properties rename to fcrepo-server/src/main/resources/fcfg/server/log4j.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/logging.properties b/fcrepo-server/src/main/resources/fcfg/server/logging.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/logging.properties rename to fcrepo-server/src/main/resources/fcfg/server/logging.properties diff --git a/fedorarepo-server/src/main/resources/fcfg/server/test.properties b/fcrepo-server/src/main/resources/fcfg/server/test.properties similarity index 100% rename from fedorarepo-server/src/main/resources/fcfg/server/test.properties rename to fcrepo-server/src/main/resources/fcfg/server/test.properties diff --git a/fedorarepo-server/src/main/resources/images/server/newlogo2.jpg b/fcrepo-server/src/main/resources/images/server/newlogo2.jpg similarity index 100% rename from fedorarepo-server/src/main/resources/images/server/newlogo2.jpg rename to fcrepo-server/src/main/resources/images/server/newlogo2.jpg diff --git a/fedorarepo-server/src/main/resources/images/server/version1.jpg b/fcrepo-server/src/main/resources/images/server/version1.jpg similarity index 100% rename from fedorarepo-server/src/main/resources/images/server/version1.jpg rename to fcrepo-server/src/main/resources/images/server/version1.jpg diff --git a/fedorarepo-server/src/main/resources/images/server/version2.jpg b/fcrepo-server/src/main/resources/images/server/version2.jpg similarity index 100% rename from fedorarepo-server/src/main/resources/images/server/version2.jpg rename to fcrepo-server/src/main/resources/images/server/version2.jpg diff --git a/fedorarepo-server/src/main/resources/properties/batch-demo/build-ingest.properties b/fcrepo-server/src/main/resources/properties/batch-demo/build-ingest.properties similarity index 100% rename from fedorarepo-server/src/main/resources/properties/batch-demo/build-ingest.properties rename to fcrepo-server/src/main/resources/properties/batch-demo/build-ingest.properties diff --git a/fedorarepo-server/src/main/resources/properties/batch-demo/build.properties b/fcrepo-server/src/main/resources/properties/batch-demo/build.properties similarity index 100% rename from fedorarepo-server/src/main/resources/properties/batch-demo/build.properties rename to fcrepo-server/src/main/resources/properties/batch-demo/build.properties diff --git a/fedorarepo-server/src/main/resources/properties/batch-demo/ingest.properties b/fcrepo-server/src/main/resources/properties/batch-demo/ingest.properties similarity index 100% rename from fedorarepo-server/src/main/resources/properties/batch-demo/ingest.properties rename to fcrepo-server/src/main/resources/properties/batch-demo/ingest.properties diff --git a/fedorarepo-server/src/main/resources/properties/install.properties b/fcrepo-server/src/main/resources/properties/install.properties similarity index 100% rename from fedorarepo-server/src/main/resources/properties/install.properties rename to fcrepo-server/src/main/resources/properties/install.properties diff --git a/fedorarepo-server/src/main/resources/properties/soapclient/soapclient.properties b/fcrepo-server/src/main/resources/properties/soapclient/soapclient.properties similarity index 100% rename from fedorarepo-server/src/main/resources/properties/soapclient/soapclient.properties rename to fcrepo-server/src/main/resources/properties/soapclient/soapclient.properties diff --git a/fedorarepo-server/src/main/resources/rdfs/fedora_relsext_ontology.rdfs b/fcrepo-server/src/main/resources/rdfs/fedora_relsext_ontology.rdfs similarity index 100% rename from fedorarepo-server/src/main/resources/rdfs/fedora_relsext_ontology.rdfs rename to fcrepo-server/src/main/resources/rdfs/fedora_relsext_ontology.rdfs diff --git a/fedorarepo-server/src/main/resources/schematron/atom-bogus.xml b/fcrepo-server/src/main/resources/schematron/atom-bogus.xml similarity index 100% rename from fedorarepo-server/src/main/resources/schematron/atom-bogus.xml rename to fcrepo-server/src/main/resources/schematron/atom-bogus.xml diff --git a/fedorarepo-server/src/main/resources/schematron/atom.sch b/fcrepo-server/src/main/resources/schematron/atom.sch similarity index 100% rename from fedorarepo-server/src/main/resources/schematron/atom.sch rename to fcrepo-server/src/main/resources/schematron/atom.sch diff --git a/fedorarepo-server/src/main/resources/schematron/foxmlRules1-0.xml b/fcrepo-server/src/main/resources/schematron/foxmlRules1-0.xml similarity index 100% rename from fedorarepo-server/src/main/resources/schematron/foxmlRules1-0.xml rename to fcrepo-server/src/main/resources/schematron/foxmlRules1-0.xml diff --git a/fedorarepo-server/src/main/resources/schematron/foxmlRules1-1.xml b/fcrepo-server/src/main/resources/schematron/foxmlRules1-1.xml similarity index 100% rename from fedorarepo-server/src/main/resources/schematron/foxmlRules1-1.xml rename to fcrepo-server/src/main/resources/schematron/foxmlRules1-1.xml diff --git a/fedorarepo-server/src/main/resources/schematron/iso_schematron_skeleton.xsl b/fcrepo-server/src/main/resources/schematron/iso_schematron_skeleton.xsl similarity index 100% rename from fedorarepo-server/src/main/resources/schematron/iso_schematron_skeleton.xsl rename to fcrepo-server/src/main/resources/schematron/iso_schematron_skeleton.xsl diff --git a/fedorarepo-server/src/main/resources/schematron/iso_schematron_skeleton_for_saxon.xsl b/fcrepo-server/src/main/resources/schematron/iso_schematron_skeleton_for_saxon.xsl similarity index 100% rename from fedorarepo-server/src/main/resources/schematron/iso_schematron_skeleton_for_saxon.xsl rename to fcrepo-server/src/main/resources/schematron/iso_schematron_skeleton_for_saxon.xsl diff --git a/fedorarepo-server/src/main/resources/schematron/iso_schematron_skeleton_for_xslt1.xsl b/fcrepo-server/src/main/resources/schematron/iso_schematron_skeleton_for_xslt1.xsl similarity index 100% rename from fedorarepo-server/src/main/resources/schematron/iso_schematron_skeleton_for_xslt1.xsl rename to fcrepo-server/src/main/resources/schematron/iso_schematron_skeleton_for_xslt1.xsl diff --git a/fedorarepo-server/src/main/resources/schematron/metsExtRules1-0.xml b/fcrepo-server/src/main/resources/schematron/metsExtRules1-0.xml similarity index 100% rename from fedorarepo-server/src/main/resources/schematron/metsExtRules1-0.xml rename to fcrepo-server/src/main/resources/schematron/metsExtRules1-0.xml diff --git a/fedorarepo-server/src/main/resources/schematron/metsExtRules1-1.xml b/fcrepo-server/src/main/resources/schematron/metsExtRules1-1.xml similarity index 100% rename from fedorarepo-server/src/main/resources/schematron/metsExtRules1-1.xml rename to fcrepo-server/src/main/resources/schematron/metsExtRules1-1.xml diff --git a/fedorarepo-server/src/main/resources/schematron/preprocessor.xslt b/fcrepo-server/src/main/resources/schematron/preprocessor.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/schematron/preprocessor.xslt rename to fcrepo-server/src/main/resources/schematron/preprocessor.xslt diff --git a/fedorarepo-server/src/main/resources/scripts/bat/server/env-server.bat b/fcrepo-server/src/main/resources/scripts/bat/server/env-server.bat similarity index 100% rename from fedorarepo-server/src/main/resources/scripts/bat/server/env-server.bat rename to fcrepo-server/src/main/resources/scripts/bat/server/env-server.bat diff --git a/fedorarepo-server/src/main/resources/scripts/bat/server/fedora-rebuild.bat b/fcrepo-server/src/main/resources/scripts/bat/server/fedora-rebuild.bat similarity index 100% rename from fedorarepo-server/src/main/resources/scripts/bat/server/fedora-rebuild.bat rename to fcrepo-server/src/main/resources/scripts/bat/server/fedora-rebuild.bat diff --git a/fedorarepo-server/src/main/resources/scripts/bat/server/fedora-reload-policies.bat b/fcrepo-server/src/main/resources/scripts/bat/server/fedora-reload-policies.bat similarity index 100% rename from fedorarepo-server/src/main/resources/scripts/bat/server/fedora-reload-policies.bat rename to fcrepo-server/src/main/resources/scripts/bat/server/fedora-reload-policies.bat diff --git a/fedorarepo-server/src/main/resources/scripts/bat/server/validate-policy.bat b/fcrepo-server/src/main/resources/scripts/bat/server/validate-policy.bat similarity index 100% rename from fedorarepo-server/src/main/resources/scripts/bat/server/validate-policy.bat rename to fcrepo-server/src/main/resources/scripts/bat/server/validate-policy.bat diff --git a/fedorarepo-server/src/main/resources/scripts/sh/server/env-server.sh b/fcrepo-server/src/main/resources/scripts/sh/server/env-server.sh similarity index 100% rename from fedorarepo-server/src/main/resources/scripts/sh/server/env-server.sh rename to fcrepo-server/src/main/resources/scripts/sh/server/env-server.sh diff --git a/fedorarepo-server/src/main/resources/scripts/sh/server/fedora-rebuild.sh b/fcrepo-server/src/main/resources/scripts/sh/server/fedora-rebuild.sh similarity index 100% rename from fedorarepo-server/src/main/resources/scripts/sh/server/fedora-rebuild.sh rename to fcrepo-server/src/main/resources/scripts/sh/server/fedora-rebuild.sh diff --git a/fedorarepo-server/src/main/resources/scripts/sh/server/fedora-reload-policies.sh b/fcrepo-server/src/main/resources/scripts/sh/server/fedora-reload-policies.sh similarity index 100% rename from fedorarepo-server/src/main/resources/scripts/sh/server/fedora-reload-policies.sh rename to fcrepo-server/src/main/resources/scripts/sh/server/fedora-reload-policies.sh diff --git a/fedorarepo-server/src/main/resources/scripts/sh/server/validate-policy.sh b/fcrepo-server/src/main/resources/scripts/sh/server/validate-policy.sh similarity index 100% rename from fedorarepo-server/src/main/resources/scripts/sh/server/validate-policy.sh rename to fcrepo-server/src/main/resources/scripts/sh/server/validate-policy.sh diff --git a/fedorarepo-server/src/main/resources/utilities/server/fedora/server/config/webxml/webxml-mapping.xml b/fcrepo-server/src/main/resources/utilities/server/fedora/server/config/webxml/webxml-mapping.xml similarity index 100% rename from fedorarepo-server/src/main/resources/utilities/server/fedora/server/config/webxml/webxml-mapping.xml rename to fcrepo-server/src/main/resources/utilities/server/fedora/server/config/webxml/webxml-mapping.xml diff --git a/fedorarepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ContentModel-3.0.xml b/fcrepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ContentModel-3.0.xml similarity index 100% rename from fedorarepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ContentModel-3.0.xml rename to fcrepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ContentModel-3.0.xml diff --git a/fedorarepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_FedoraObject-3.0.xml b/fcrepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_FedoraObject-3.0.xml similarity index 100% rename from fedorarepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_FedoraObject-3.0.xml rename to fcrepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_FedoraObject-3.0.xml diff --git a/fedorarepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ServiceDefinition-3.0.xml b/fcrepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ServiceDefinition-3.0.xml similarity index 100% rename from fedorarepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ServiceDefinition-3.0.xml rename to fcrepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ServiceDefinition-3.0.xml diff --git a/fedorarepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ServiceDeployment-3.0.xml b/fcrepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ServiceDeployment-3.0.xml similarity index 100% rename from fedorarepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ServiceDeployment-3.0.xml rename to fcrepo-server/src/main/resources/utilities/server/fedora/server/resources/fedora-system_ServiceDeployment-3.0.xml diff --git a/fedorarepo-server/src/main/resources/utilities/server/fedora/server/security/servletfilters/xmluserfile/fedorausers-mapping.xml b/fcrepo-server/src/main/resources/utilities/server/fedora/server/security/servletfilters/xmluserfile/fedorausers-mapping.xml similarity index 100% rename from fedorarepo-server/src/main/resources/utilities/server/fedora/server/security/servletfilters/xmluserfile/fedorausers-mapping.xml rename to fcrepo-server/src/main/resources/utilities/server/fedora/server/security/servletfilters/xmluserfile/fedorausers-mapping.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-apim-if-not-localhost.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-apim-if-not-localhost.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-apim-if-not-localhost.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-apim-if-not-localhost.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-inactive-or-deleted-objects-or-datastreams-if-not-administrator.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-inactive-or-deleted-objects-or-datastreams-if-not-administrator.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-inactive-or-deleted-objects-or-datastreams-if-not-administrator.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-inactive-or-deleted-objects-or-datastreams-if-not-administrator.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-policy-management-if-not-administrator.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-policy-management-if-not-administrator.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-policy-management-if-not-administrator.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-policy-management-if-not-administrator.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-purge-datastream-if-active-or-inactive.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-purge-datastream-if-active-or-inactive.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-purge-datastream-if-active-or-inactive.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-purge-datastream-if-active-or-inactive.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-purge-object-if-active-or-inactive.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-purge-object-if-active-or-inactive.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-purge-object-if-active-or-inactive.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-purge-object-if-active-or-inactive.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-reloadPolicies-if-not-localhost.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-reloadPolicies-if-not-localhost.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-reloadPolicies-if-not-localhost.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-reloadPolicies-if-not-localhost.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-unallowed-file-resolution.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-unallowed-file-resolution.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-unallowed-file-resolution.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/deny-unallowed-file-resolution.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-anything-to-administrator.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-anything-to-administrator.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-anything-to-administrator.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-anything-to-administrator.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-apia-unrestricted.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-apia-unrestricted.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-apia-unrestricted.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-apia-unrestricted.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-dsstate-check-unrestricted.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-dsstate-check-unrestricted.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-dsstate-check-unrestricted.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-dsstate-check-unrestricted.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-oai-unrestricted.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-oai-unrestricted.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-oai-unrestricted.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-oai-unrestricted.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-serverStatus-unrestricted.xml b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-serverStatus-unrestricted.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-serverStatus-unrestricted.xml rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/permit-serverStatus-unrestricted.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/readme.txt b/fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/readme.txt similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/readme.txt rename to fcrepo-server/src/main/resources/xacml-policies/default/default-repository-policies-approximating-2.0/readme.txt diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-11.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-11.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-11.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-11.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-26.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-26.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-26.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-26.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-5.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-5.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-5.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-object-policies/demo-5.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-except-by-owner.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-except-by-owner.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-except-by-owner.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-except-by-owner.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-if-not-tomcat-role.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-if-not-tomcat-role.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-if-not-tomcat-role.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-if-not-tomcat-role.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-to-ldap-group.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-to-ldap-group.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-to-ldap-group.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-to-ldap-group.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-to-tomcat-user.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-to-tomcat-user.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-to-tomcat-user.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-all-methods/deny-apia-to-tomcat-user.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-all-users.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-all-users.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-all-users.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-all-users.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-tomcat-group-ALT1.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-tomcat-group-ALT1.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-tomcat-group-ALT1.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-tomcat-group-ALT1.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-tomcat-group-ALT2.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-tomcat-group-ALT2.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-tomcat-group-ALT2.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-DC-to-tomcat-group-ALT2.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-MRSID-if-not-tomcat-role.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-MRSID-if-not-tomcat-role.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-MRSID-if-not-tomcat-role.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-MRSID-if-not-tomcat-role.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-TEISOURCE-to-tomcat-user.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-TEISOURCE-to-tomcat-user.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-TEISOURCE-to-tomcat-user.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-TEISOURCE-to-tomcat-user.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-all-to-all-users.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-all-to-all-users.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-all-to-all-users.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-datastreams/deny-apia-datastream-all-to-all-users.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-DualResImage-to-all-users.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-DualResImage-to-all-users.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-DualResImage-to-all-users.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-DualResImage-to-all-users.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-if-not-tomcat-role.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-if-not-tomcat-role.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-if-not-tomcat-role.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-if-not-tomcat-role.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-all-users.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-all-users.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-all-users.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-all-users.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-ldap-group.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-ldap-group.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-ldap-group.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-ldap-group.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-tomcat-user.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-tomcat-user.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-tomcat-user.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-disseminations/deny-apia-dissem-demo1-getMedium-to-tomcat-user.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-by-cmodel-to-ldap-group.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-by-cmodel-to-ldap-group.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-by-cmodel-to-ldap-group.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-by-cmodel-to-ldap-group.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-by-pids-to-tomcat-role.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-by-pids-to-tomcat-role.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-by-pids-to-tomcat-role.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-by-pids-to-tomcat-role.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-hide-datastreams-if-not-tomcat-role.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-hide-datastreams-if-not-tomcat-role.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-hide-datastreams-if-not-tomcat-role.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apia-tighten-defaults/apia-restrict-objects-by-attributes/deny-objects-hide-datastreams-if-not-tomcat-role.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-ldap-group.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-ldap-group.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-ldap-group.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-ldap-group.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-tomcat-group.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-tomcat-group.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-tomcat-group.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-tomcat-group.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-tomcat-user.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-tomcat-user.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-tomcat-user.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/apim-loosen-defaults/apim-permit-all-methods/permit-apim-by-tomcat-user.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-apia-to-all-users.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-apia-to-all-users.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-apia-to-all-users.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-apia-to-all-users.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-apim-to-all-users.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-apim-to-all-users.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-apim-to-all-users.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-apim-to-all-users.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-in-ip-address-range.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-in-ip-address-range.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-in-ip-address-range.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-in-ip-address-range.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-modified-after.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-modified-after.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-modified-after.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-modified-after.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-not-authenticated.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-not-authenticated.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-not-authenticated.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-not-authenticated.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-not-in-ip-address-range.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-not-in-ip-address-range.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-not-in-ip-address-range.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-if-not-in-ip-address-range.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-object-to-all-users.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-object-to-all-users.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-object-to-all-users.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/draconian-restrictions/deny-object-to-all-users.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/permit-anything.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/permit-anything.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/permit-anything.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/permit-anything.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/permit-if-owner.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/permit-if-owner.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/permit-if-owner.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/permit-if-owner.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/schema-broken.xml b/fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/schema-broken.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/schema-broken.xml rename to fcrepo-server/src/main/resources/xacml-policies/examples/example-repository-policies/schema-broken.xml diff --git a/fedorarepo-server/src/main/resources/xacml-policies/readme-design-choices.txt b/fcrepo-server/src/main/resources/xacml-policies/readme-design-choices.txt similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/readme-design-choices.txt rename to fcrepo-server/src/main/resources/xacml-policies/readme-design-choices.txt diff --git a/fedorarepo-server/src/main/resources/xacml-policies/readme-policyguitool-generated-policies.txt b/fcrepo-server/src/main/resources/xacml-policies/readme-policyguitool-generated-policies.txt similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/readme-policyguitool-generated-policies.txt rename to fcrepo-server/src/main/resources/xacml-policies/readme-policyguitool-generated-policies.txt diff --git a/fedorarepo-server/src/main/resources/xacml-policies/readme.txt b/fcrepo-server/src/main/resources/xacml-policies/readme.txt similarity index 100% rename from fedorarepo-server/src/main/resources/xacml-policies/readme.txt rename to fcrepo-server/src/main/resources/xacml-policies/readme.txt diff --git a/fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/americanacademy.xml b/fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/americanacademy.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/americanacademy.xml rename to fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/americanacademy.xml diff --git a/fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/appianway.xml b/fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/appianway.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/appianway.xml rename to fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/appianway.xml diff --git a/fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/coliseum.xml b/fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/coliseum.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/coliseum.xml rename to fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/coliseum.xml diff --git a/fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/pantheon.xml b/fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/pantheon.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/pantheon.xml rename to fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/pantheon.xml diff --git a/fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/romanwedding.xml b/fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/romanwedding.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/romanwedding.xml rename to fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/romanwedding.xml diff --git a/fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/stpeters.xml b/fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/stpeters.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/stpeters.xml rename to fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/stpeters.xml diff --git a/fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/templevenusandrome.xml b/fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/templevenusandrome.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/templevenusandrome.xml rename to fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/templevenusandrome.xml diff --git a/fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/tiberriver.xml b/fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/tiberriver.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/tiberriver.xml rename to fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/tiberriver.xml diff --git a/fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/trevifountain.xml b/fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/trevifountain.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/trevifountain.xml rename to fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/trevifountain.xml diff --git a/fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/vaticanlibrary.xml b/fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/vaticanlibrary.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xml/batch-demo/object-specifics/vaticanlibrary.xml rename to fcrepo-server/src/main/resources/xml/batch-demo/object-specifics/vaticanlibrary.xml diff --git a/fedorarepo-server/src/main/resources/xml/client-log4j.xml b/fcrepo-server/src/main/resources/xml/client-log4j.xml similarity index 100% rename from fedorarepo-server/src/main/resources/xml/client-log4j.xml rename to fcrepo-server/src/main/resources/xml/client-log4j.xml diff --git a/fedorarepo-server/src/main/resources/xsd/XMLSchema.dtd b/fcrepo-server/src/main/resources/xsd/XMLSchema.dtd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/XMLSchema.dtd rename to fcrepo-server/src/main/resources/xsd/XMLSchema.dtd diff --git a/fedorarepo-server/src/main/resources/xsd/atom.xsd b/fcrepo-server/src/main/resources/xsd/atom.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/atom.xsd rename to fcrepo-server/src/main/resources/xsd/atom.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/batchMerge.xsd b/fcrepo-server/src/main/resources/xsd/batchMerge.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/batchMerge.xsd rename to fcrepo-server/src/main/resources/xsd/batchMerge.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/batchModify-1.1.xsd b/fcrepo-server/src/main/resources/xsd/batchModify-1.1.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/batchModify-1.1.xsd rename to fcrepo-server/src/main/resources/xsd/batchModify-1.1.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/batchModify.xsd b/fcrepo-server/src/main/resources/xsd/batchModify.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/batchModify.xsd rename to fcrepo-server/src/main/resources/xsd/batchModify.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/beSecurity.xsd b/fcrepo-server/src/main/resources/xsd/beSecurity.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/beSecurity.xsd rename to fcrepo-server/src/main/resources/xsd/beSecurity.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/behaviorDefs.xsd b/fcrepo-server/src/main/resources/xsd/behaviorDefs.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/behaviorDefs.xsd rename to fcrepo-server/src/main/resources/xsd/behaviorDefs.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/cs-xacml-schema-policy-01.xsd b/fcrepo-server/src/main/resources/xsd/cs-xacml-schema-policy-01.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/cs-xacml-schema-policy-01.xsd rename to fcrepo-server/src/main/resources/xsd/cs-xacml-schema-policy-01.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/datastreamProfile.xsd b/fcrepo-server/src/main/resources/xsd/datastreamProfile.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/datastreamProfile.xsd rename to fcrepo-server/src/main/resources/xsd/datastreamProfile.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/datatypes.dtd b/fcrepo-server/src/main/resources/xsd/datatypes.dtd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/datatypes.dtd rename to fcrepo-server/src/main/resources/xsd/datatypes.dtd diff --git a/fedorarepo-server/src/main/resources/xsd/dsCompositeModel.xsd b/fcrepo-server/src/main/resources/xsd/dsCompositeModel.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/dsCompositeModel.xsd rename to fcrepo-server/src/main/resources/xsd/dsCompositeModel.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/fedora-config.xsd b/fcrepo-server/src/main/resources/xsd/fedora-config.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/fedora-config.xsd rename to fcrepo-server/src/main/resources/xsd/fedora-config.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/fedoraBindingSpec-1.1.xsd b/fcrepo-server/src/main/resources/xsd/fedoraBindingSpec-1.1.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/fedoraBindingSpec-1.1.xsd rename to fcrepo-server/src/main/resources/xsd/fedoraBindingSpec-1.1.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/fedoraBindingSpec.xsd b/fcrepo-server/src/main/resources/xsd/fedoraBindingSpec.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/fedoraBindingSpec.xsd rename to fcrepo-server/src/main/resources/xsd/fedoraBindingSpec.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/fedoraObjectHistory.xsd b/fcrepo-server/src/main/resources/xsd/fedoraObjectHistory.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/fedoraObjectHistory.xsd rename to fcrepo-server/src/main/resources/xsd/fedoraObjectHistory.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/fedoraRepository.xsd b/fcrepo-server/src/main/resources/xsd/fedoraRepository.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/fedoraRepository.xsd rename to fcrepo-server/src/main/resources/xsd/fedoraRepository.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/fedoraSDefMethodMap.xsd b/fcrepo-server/src/main/resources/xsd/fedoraSDefMethodMap.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/fedoraSDefMethodMap.xsd rename to fcrepo-server/src/main/resources/xsd/fedoraSDefMethodMap.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/fedoraSDepMethodMap-1.1.xsd b/fcrepo-server/src/main/resources/xsd/fedoraSDepMethodMap-1.1.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/fedoraSDepMethodMap-1.1.xsd rename to fcrepo-server/src/main/resources/xsd/fedoraSDepMethodMap-1.1.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/fedoraSDepMethodMap.xsd b/fcrepo-server/src/main/resources/xsd/fedoraSDepMethodMap.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/fedoraSDepMethodMap.xsd rename to fcrepo-server/src/main/resources/xsd/fedoraSDepMethodMap.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/fedoraServiceProfile.xsd b/fcrepo-server/src/main/resources/xsd/fedoraServiceProfile.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/fedoraServiceProfile.xsd rename to fcrepo-server/src/main/resources/xsd/fedoraServiceProfile.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/foxml1-0.xsd b/fcrepo-server/src/main/resources/xsd/foxml1-0.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/foxml1-0.xsd rename to fcrepo-server/src/main/resources/xsd/foxml1-0.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/foxml1-1.xsd b/fcrepo-server/src/main/resources/xsd/foxml1-1.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/foxml1-1.xsd rename to fcrepo-server/src/main/resources/xsd/foxml1-1.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/getNextPIDInfo.xsd b/fcrepo-server/src/main/resources/xsd/getNextPIDInfo.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/getNextPIDInfo.xsd rename to fcrepo-server/src/main/resources/xsd/getNextPIDInfo.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/listDatastreams.xsd b/fcrepo-server/src/main/resources/xsd/listDatastreams.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/listDatastreams.xsd rename to fcrepo-server/src/main/resources/xsd/listDatastreams.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/listMethods.xsd b/fcrepo-server/src/main/resources/xsd/listMethods.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/listMethods.xsd rename to fcrepo-server/src/main/resources/xsd/listMethods.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/local.xsd b/fcrepo-server/src/main/resources/xsd/local.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/local.xsd rename to fcrepo-server/src/main/resources/xsd/local.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/mets-fedora-ext.xsd b/fcrepo-server/src/main/resources/xsd/mets-fedora-ext.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/mets-fedora-ext.xsd rename to fcrepo-server/src/main/resources/xsd/mets-fedora-ext.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/mets-fedora-ext1-1.xsd b/fcrepo-server/src/main/resources/xsd/mets-fedora-ext1-1.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/mets-fedora-ext1-1.xsd rename to fcrepo-server/src/main/resources/xsd/mets-fedora-ext1-1.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/objectItemIndex.xsd b/fcrepo-server/src/main/resources/xsd/objectItemIndex.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/objectItemIndex.xsd rename to fcrepo-server/src/main/resources/xsd/objectItemIndex.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/objectMethods.xsd b/fcrepo-server/src/main/resources/xsd/objectMethods.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/objectMethods.xsd rename to fcrepo-server/src/main/resources/xsd/objectMethods.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/objectProfile.xsd b/fcrepo-server/src/main/resources/xsd/objectProfile.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/objectProfile.xsd rename to fcrepo-server/src/main/resources/xsd/objectProfile.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/rels-ext.xsd b/fcrepo-server/src/main/resources/xsd/rels-ext.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/rels-ext.xsd rename to fcrepo-server/src/main/resources/xsd/rels-ext.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/rels-int.xsd b/fcrepo-server/src/main/resources/xsd/rels-int.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/rels-int.xsd rename to fcrepo-server/src/main/resources/xsd/rels-int.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/xhtml.xsd b/fcrepo-server/src/main/resources/xsd/xhtml.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/xhtml.xsd rename to fcrepo-server/src/main/resources/xsd/xhtml.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/xhtml1-strict.xsd b/fcrepo-server/src/main/resources/xsd/xhtml1-strict.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/xhtml1-strict.xsd rename to fcrepo-server/src/main/resources/xsd/xhtml1-strict.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/xlink-1999.xsd b/fcrepo-server/src/main/resources/xsd/xlink-1999.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/xlink-1999.xsd rename to fcrepo-server/src/main/resources/xsd/xlink-1999.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/xlink.xsd b/fcrepo-server/src/main/resources/xsd/xlink.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/xlink.xsd rename to fcrepo-server/src/main/resources/xsd/xlink.xsd diff --git a/fedorarepo-server/src/main/resources/xsd/xml.xsd b/fcrepo-server/src/main/resources/xsd/xml.xsd similarity index 100% rename from fedorarepo-server/src/main/resources/xsd/xml.xsd rename to fcrepo-server/src/main/resources/xsd/xml.xsd diff --git a/fedorarepo-server/src/main/resources/xsl/access/listDatastreams.xslt b/fcrepo-server/src/main/resources/xsl/access/listDatastreams.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/access/listDatastreams.xslt rename to fcrepo-server/src/main/resources/xsl/access/listDatastreams.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/access/listMethods.xslt b/fcrepo-server/src/main/resources/xsl/access/listMethods.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/access/listMethods.xslt rename to fcrepo-server/src/main/resources/xsl/access/listMethods.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/access/reportHtml.xslt b/fcrepo-server/src/main/resources/xsl/access/reportHtml.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/access/reportHtml.xslt rename to fcrepo-server/src/main/resources/xsl/access/reportHtml.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/access/reportRequestHtml.xslt b/fcrepo-server/src/main/resources/xsl/access/reportRequestHtml.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/access/reportRequestHtml.xslt rename to fcrepo-server/src/main/resources/xsl/access/reportRequestHtml.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/access/reportXml.xslt b/fcrepo-server/src/main/resources/xsl/access/reportXml.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/access/reportXml.xslt rename to fcrepo-server/src/main/resources/xsl/access/reportXml.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/access/viewDublinCore.xslt b/fcrepo-server/src/main/resources/xsl/access/viewDublinCore.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/access/viewDublinCore.xslt rename to fcrepo-server/src/main/resources/xsl/access/viewDublinCore.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/access/viewItemIndex.xslt b/fcrepo-server/src/main/resources/xsl/access/viewItemIndex.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/access/viewItemIndex.xslt rename to fcrepo-server/src/main/resources/xsl/access/viewItemIndex.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/access/viewObjectHistory.xslt b/fcrepo-server/src/main/resources/xsl/access/viewObjectHistory.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/access/viewObjectHistory.xslt rename to fcrepo-server/src/main/resources/xsl/access/viewObjectHistory.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/access/viewObjectProfile.xslt b/fcrepo-server/src/main/resources/xsl/access/viewObjectProfile.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/access/viewObjectProfile.xslt rename to fcrepo-server/src/main/resources/xsl/access/viewObjectProfile.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/access/viewRepositoryInfo.xslt b/fcrepo-server/src/main/resources/xsl/access/viewRepositoryInfo.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/access/viewRepositoryInfo.xslt rename to fcrepo-server/src/main/resources/xsl/access/viewRepositoryInfo.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/batchtool/foxml-merge.xsl b/fcrepo-server/src/main/resources/xsl/batchtool/foxml-merge.xsl similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/batchtool/foxml-merge.xsl rename to fcrepo-server/src/main/resources/xsl/batchtool/foxml-merge.xsl diff --git a/fedorarepo-server/src/main/resources/xsl/batchtool/mets-merge.xsl b/fcrepo-server/src/main/resources/xsl/batchtool/mets-merge.xsl similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/batchtool/mets-merge.xsl rename to fcrepo-server/src/main/resources/xsl/batchtool/mets-merge.xsl diff --git a/fedorarepo-server/src/main/resources/xsl/management/backendSecurityConfig.xslt b/fcrepo-server/src/main/resources/xsl/management/backendSecurityConfig.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/management/backendSecurityConfig.xslt rename to fcrepo-server/src/main/resources/xsl/management/backendSecurityConfig.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/management/getNextPIDInfo.xslt b/fcrepo-server/src/main/resources/xsl/management/getNextPIDInfo.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/management/getNextPIDInfo.xslt rename to fcrepo-server/src/main/resources/xsl/management/getNextPIDInfo.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/management/viewDatastreamProfile.xslt b/fcrepo-server/src/main/resources/xsl/management/viewDatastreamProfile.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/management/viewDatastreamProfile.xslt rename to fcrepo-server/src/main/resources/xsl/management/viewDatastreamProfile.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/ri/base.css b/fcrepo-server/src/main/resources/xsl/ri/base.css similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/ri/base.css rename to fcrepo-server/src/main/resources/xsl/ri/base.css diff --git a/fedorarepo-server/src/main/resources/xsl/ri/error.xsl b/fcrepo-server/src/main/resources/xsl/ri/error.xsl similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/ri/error.xsl rename to fcrepo-server/src/main/resources/xsl/ri/error.xsl diff --git a/fedorarepo-server/src/main/resources/xsl/ri/form.css b/fcrepo-server/src/main/resources/xsl/ri/form.css similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/ri/form.css rename to fcrepo-server/src/main/resources/xsl/ri/form.css diff --git a/fedorarepo-server/src/main/resources/xsl/ri/form.xsl b/fcrepo-server/src/main/resources/xsl/ri/form.xsl similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/ri/form.xsl rename to fcrepo-server/src/main/resources/xsl/ri/form.xsl diff --git a/fedorarepo-server/src/main/resources/xsl/ri/index.xsl b/fcrepo-server/src/main/resources/xsl/ri/index.xsl similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/ri/index.xsl rename to fcrepo-server/src/main/resources/xsl/ri/index.xsl diff --git a/fedorarepo-server/src/main/resources/xsl/security/build-backend-policy.xsl b/fcrepo-server/src/main/resources/xsl/security/build-backend-policy.xsl similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/security/build-backend-policy.xsl rename to fcrepo-server/src/main/resources/xsl/security/build-backend-policy.xsl diff --git a/fedorarepo-server/src/main/resources/xsl/security/remove-web-xml-security.xsl b/fcrepo-server/src/main/resources/xsl/security/remove-web-xml-security.xsl similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/security/remove-web-xml-security.xsl rename to fcrepo-server/src/main/resources/xsl/security/remove-web-xml-security.xsl diff --git a/fedorarepo-server/src/main/resources/xsl/soapclient/listDatastreams.xslt b/fcrepo-server/src/main/resources/xsl/soapclient/listDatastreams.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/soapclient/listDatastreams.xslt rename to fcrepo-server/src/main/resources/xsl/soapclient/listDatastreams.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/soapclient/listMethods.xslt b/fcrepo-server/src/main/resources/xsl/soapclient/listMethods.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/soapclient/listMethods.xslt rename to fcrepo-server/src/main/resources/xsl/soapclient/listMethods.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/soapclient/objectMethods.xslt b/fcrepo-server/src/main/resources/xsl/soapclient/objectMethods.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/soapclient/objectMethods.xslt rename to fcrepo-server/src/main/resources/xsl/soapclient/objectMethods.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/soapclient/serviceDefs.xslt b/fcrepo-server/src/main/resources/xsl/soapclient/serviceDefs.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/soapclient/serviceDefs.xslt rename to fcrepo-server/src/main/resources/xsl/soapclient/serviceDefs.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/soapclient/viewObjectHistory.xslt b/fcrepo-server/src/main/resources/xsl/soapclient/viewObjectHistory.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/soapclient/viewObjectHistory.xslt rename to fcrepo-server/src/main/resources/xsl/soapclient/viewObjectHistory.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/soapclient/viewObjectProfile.xslt b/fcrepo-server/src/main/resources/xsl/soapclient/viewObjectProfile.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/soapclient/viewObjectProfile.xslt rename to fcrepo-server/src/main/resources/xsl/soapclient/viewObjectProfile.xslt diff --git a/fedorarepo-server/src/main/resources/xsl/soapclient/viewRepositoryInfo.xslt b/fcrepo-server/src/main/resources/xsl/soapclient/viewRepositoryInfo.xslt similarity index 100% rename from fedorarepo-server/src/main/resources/xsl/soapclient/viewRepositoryInfo.xslt rename to fcrepo-server/src/main/resources/xsl/soapclient/viewRepositoryInfo.xslt diff --git a/fedorarepo-server/src/test/java/fedora/server/AllIntegrationTests.java b/fcrepo-server/src/test/java/fedora/server/AllIntegrationTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/AllIntegrationTests.java rename to fcrepo-server/src/test/java/fedora/server/AllIntegrationTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/AllOfflineTests.java b/fcrepo-server/src/test/java/fedora/server/AllOfflineTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/AllOfflineTests.java rename to fcrepo-server/src/test/java/fedora/server/AllOfflineTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/DummyServer.java b/fcrepo-server/src/test/java/fedora/server/DummyServer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/DummyServer.java rename to fcrepo-server/src/test/java/fedora/server/DummyServer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/AbstractJournalTester.java b/fcrepo-server/src/test/java/fedora/server/journal/AbstractJournalTester.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/AbstractJournalTester.java rename to fcrepo-server/src/test/java/fedora/server/journal/AbstractJournalTester.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/AllIntegrationTests.java b/fcrepo-server/src/test/java/fedora/server/journal/AllIntegrationTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/AllIntegrationTests.java rename to fcrepo-server/src/test/java/fedora/server/journal/AllIntegrationTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/journal/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/journal/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/MockJournalReader.java b/fcrepo-server/src/test/java/fedora/server/journal/MockJournalReader.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/MockJournalReader.java rename to fcrepo-server/src/test/java/fedora/server/journal/MockJournalReader.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/MockJournalRecoveryLog.java b/fcrepo-server/src/test/java/fedora/server/journal/MockJournalRecoveryLog.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/MockJournalRecoveryLog.java rename to fcrepo-server/src/test/java/fedora/server/journal/MockJournalRecoveryLog.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/MockJournalWriter.java b/fcrepo-server/src/test/java/fedora/server/journal/MockJournalWriter.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/MockJournalWriter.java rename to fcrepo-server/src/test/java/fedora/server/journal/MockJournalWriter.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/MockServerForJournalTesting.java b/fcrepo-server/src/test/java/fedora/server/journal/MockServerForJournalTesting.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/MockServerForJournalTesting.java rename to fcrepo-server/src/test/java/fedora/server/journal/MockServerForJournalTesting.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/TestJournalRoundTrip.java b/fcrepo-server/src/test/java/fedora/server/journal/TestJournalRoundTrip.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/TestJournalRoundTrip.java rename to fcrepo-server/src/test/java/fedora/server/journal/TestJournalRoundTrip.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/helpers/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/journal/helpers/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/helpers/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/journal/helpers/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/helpers/TestParameterHelper.java b/fcrepo-server/src/test/java/fedora/server/journal/helpers/TestParameterHelper.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/helpers/TestParameterHelper.java rename to fcrepo-server/src/test/java/fedora/server/journal/helpers/TestParameterHelper.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/helpers/TestPasswordCipher.java b/fcrepo-server/src/test/java/fedora/server/journal/helpers/TestPasswordCipher.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/helpers/TestPasswordCipher.java rename to fcrepo-server/src/test/java/fedora/server/journal/helpers/TestPasswordCipher.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/AllIntegrationTests.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/AllIntegrationTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/AllIntegrationTests.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/AllIntegrationTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/AllIntegrationTests.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/AllIntegrationTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/AllIntegrationTests.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/AllIntegrationTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/MockMulticastJournalWriter.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/MockMulticastJournalWriter.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/MockMulticastJournalWriter.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/MockMulticastJournalWriter.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/MockTransport.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/MockTransport.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/MockTransport.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/MockTransport.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/SampleJournalEntries.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/SampleJournalEntries.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/SampleJournalEntries.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/SampleJournalEntries.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/SampleJournalFile1.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/SampleJournalFile1.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/SampleJournalFile1.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/SampleJournalFile1.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestJournalEntrySizeEstimator.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestJournalEntrySizeEstimator.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestJournalEntrySizeEstimator.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestJournalEntrySizeEstimator.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestLocalDirectoryTransport.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestLocalDirectoryTransport.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestLocalDirectoryTransport.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestLocalDirectoryTransport.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestMulticastJournalWriterInitializations.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestMulticastJournalWriterInitializations.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestMulticastJournalWriterInitializations.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestMulticastJournalWriterInitializations.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestMulticastJournalWriterOperation.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestMulticastJournalWriterOperation.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestMulticastJournalWriterOperation.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/TestMulticastJournalWriterOperation.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/AllIntegrationTests.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/AllIntegrationTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/AllIntegrationTests.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/AllIntegrationTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/MockRmiJournalReceiver.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/MockRmiJournalReceiver.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/MockRmiJournalReceiver.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/MockRmiJournalReceiver.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiJournalReceiver.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiJournalReceiver.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiJournalReceiver.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiJournalReceiver.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiTransport.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiTransport.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiTransport.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiTransport.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiTransportWriter.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiTransportWriter.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiTransportWriter.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multicast/rmi/TestRmiTransportWriter.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multifile/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multifile/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multifile/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multifile/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multifile/TestLockingFollowingJournalReader.java b/fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multifile/TestLockingFollowingJournalReader.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/readerwriter/multifile/TestLockingFollowingJournalReader.java rename to fcrepo-server/src/test/java/fedora/server/journal/readerwriter/multifile/TestLockingFollowingJournalReader.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/xmlhelpers/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/journal/xmlhelpers/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/xmlhelpers/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/journal/xmlhelpers/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/journal/xmlhelpers/TestContextXmlWriterAndReader.java b/fcrepo-server/src/test/java/fedora/server/journal/xmlhelpers/TestContextXmlWriterAndReader.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/journal/xmlhelpers/TestContextXmlWriterAndReader.java rename to fcrepo-server/src/test/java/fedora/server/journal/xmlhelpers/TestContextXmlWriterAndReader.java diff --git a/fedorarepo-server/src/test/java/fedora/server/management/MockManagementDelegate.java b/fcrepo-server/src/test/java/fedora/server/management/MockManagementDelegate.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/management/MockManagementDelegate.java rename to fcrepo-server/src/test/java/fedora/server/management/MockManagementDelegate.java diff --git a/fedorarepo-server/src/test/java/fedora/server/management/TestPIDGenerator.java b/fcrepo-server/src/test/java/fedora/server/management/TestPIDGenerator.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/management/TestPIDGenerator.java rename to fcrepo-server/src/test/java/fedora/server/management/TestPIDGenerator.java diff --git a/fedorarepo-server/src/test/java/fedora/server/messaging/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/messaging/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/messaging/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/messaging/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/messaging/JMSManagerTest.java b/fcrepo-server/src/test/java/fedora/server/messaging/JMSManagerTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/messaging/JMSManagerTest.java rename to fcrepo-server/src/test/java/fedora/server/messaging/JMSManagerTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/messaging/JNDITest.java b/fcrepo-server/src/test/java/fedora/server/messaging/JNDITest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/messaging/JNDITest.java rename to fcrepo-server/src/test/java/fedora/server/messaging/JNDITest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/messaging/Listener.java b/fcrepo-server/src/test/java/fedora/server/messaging/Listener.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/messaging/Listener.java rename to fcrepo-server/src/test/java/fedora/server/messaging/Listener.java diff --git a/fedorarepo-server/src/test/java/fedora/server/proxy/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/proxy/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/proxy/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/proxy/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/proxy/ProxyFactoryTest.java b/fcrepo-server/src/test/java/fedora/server/proxy/ProxyFactoryTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/proxy/ProxyFactoryTest.java rename to fcrepo-server/src/test/java/fedora/server/proxy/ProxyFactoryTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/resourceIndex/AllIntegrationTests.java b/fcrepo-server/src/test/java/fedora/server/resourceIndex/AllIntegrationTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/resourceIndex/AllIntegrationTests.java rename to fcrepo-server/src/test/java/fedora/server/resourceIndex/AllIntegrationTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/resourceIndex/ParamDomain.java b/fcrepo-server/src/test/java/fedora/server/resourceIndex/ParamDomain.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/resourceIndex/ParamDomain.java rename to fcrepo-server/src/test/java/fedora/server/resourceIndex/ParamDomain.java diff --git a/fedorarepo-server/src/test/java/fedora/server/resourceIndex/ParamDomainMap.java b/fcrepo-server/src/test/java/fedora/server/resourceIndex/ParamDomainMap.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/resourceIndex/ParamDomainMap.java rename to fcrepo-server/src/test/java/fedora/server/resourceIndex/ParamDomainMap.java diff --git a/fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexAddDelDSIntegrationTest.java b/fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexAddDelDSIntegrationTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexAddDelDSIntegrationTest.java rename to fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexAddDelDSIntegrationTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexAddDelMiscIntegrationTest.java b/fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexAddDelMiscIntegrationTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexAddDelMiscIntegrationTest.java rename to fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexAddDelMiscIntegrationTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexDatePrecisionIntegrationTest.java b/fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexDatePrecisionIntegrationTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexDatePrecisionIntegrationTest.java rename to fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexDatePrecisionIntegrationTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexIntegrationTest.java b/fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexIntegrationTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexIntegrationTest.java rename to fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexIntegrationTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexModDSIntegrationTest.java b/fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexModDSIntegrationTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexModDSIntegrationTest.java rename to fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexModDSIntegrationTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexModMiscIntegrationTest.java b/fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexModMiscIntegrationTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexModMiscIntegrationTest.java rename to fcrepo-server/src/test/java/fedora/server/resourceIndex/ResourceIndexModMiscIntegrationTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/search/AllIntegrationTests.java b/fcrepo-server/src/test/java/fedora/server/search/AllIntegrationTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/search/AllIntegrationTests.java rename to fcrepo-server/src/test/java/fedora/server/search/AllIntegrationTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/search/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/search/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/search/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/search/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/search/FieldSearchSQLImplIntegrationTest.java b/fcrepo-server/src/test/java/fedora/server/search/FieldSearchSQLImplIntegrationTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/search/FieldSearchSQLImplIntegrationTest.java rename to fcrepo-server/src/test/java/fedora/server/search/FieldSearchSQLImplIntegrationTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/search/TestFieldSearchSQLImpl.java b/fcrepo-server/src/test/java/fedora/server/search/TestFieldSearchSQLImpl.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/search/TestFieldSearchSQLImpl.java rename to fcrepo-server/src/test/java/fedora/server/search/TestFieldSearchSQLImpl.java diff --git a/fedorarepo-server/src/test/java/fedora/server/security/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/security/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/security/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/security/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/security/MockPolicyParser.java b/fcrepo-server/src/test/java/fedora/server/security/MockPolicyParser.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/security/MockPolicyParser.java rename to fcrepo-server/src/test/java/fedora/server/security/MockPolicyParser.java diff --git a/fedorarepo-server/src/test/java/fedora/server/security/TestPolicyParser.java b/fcrepo-server/src/test/java/fedora/server/security/TestPolicyParser.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/security/TestPolicyParser.java rename to fcrepo-server/src/test/java/fedora/server/security/TestPolicyParser.java diff --git a/fedorarepo-server/src/test/java/fedora/server/security/servletfilters/xmluserfile/TestFedoraUsers.java b/fcrepo-server/src/test/java/fedora/server/security/servletfilters/xmluserfile/TestFedoraUsers.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/security/servletfilters/xmluserfile/TestFedoraUsers.java rename to fcrepo-server/src/test/java/fedora/server/security/servletfilters/xmluserfile/TestFedoraUsers.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/storage/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/storage/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/MockDOReader.java b/fcrepo-server/src/test/java/fedora/server/storage/MockDOReader.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/MockDOReader.java rename to fcrepo-server/src/test/java/fedora/server/storage/MockDOReader.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/MockRepositoryReader.java b/fcrepo-server/src/test/java/fedora/server/storage/MockRepositoryReader.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/MockRepositoryReader.java rename to fcrepo-server/src/test/java/fedora/server/storage/MockRepositoryReader.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/MockServiceDeploymentReader.java b/fcrepo-server/src/test/java/fedora/server/storage/MockServiceDeploymentReader.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/MockServiceDeploymentReader.java rename to fcrepo-server/src/test/java/fedora/server/storage/MockServiceDeploymentReader.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorageTest.java b/fcrepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorageTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorageTest.java rename to fcrepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/AkubraLowlevelStorageTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/HashPathIdMapperTest.java b/fcrepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/HashPathIdMapperTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/HashPathIdMapperTest.java rename to fcrepo-server/src/test/java/fedora/server/storage/lowlevel/akubra/HashPathIdMapperTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/MockDODeserializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/MockDODeserializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/MockDODeserializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/MockDODeserializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/MockDOSerializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/MockDOSerializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/MockDOSerializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/MockDOSerializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestAtomDODeserializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestAtomDODeserializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestAtomDODeserializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestAtomDODeserializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestAtomDOSerializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestAtomDOSerializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestAtomDOSerializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestAtomDOSerializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestDOTranslatorImpl.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestDOTranslatorImpl.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestDOTranslatorImpl.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestDOTranslatorImpl.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_0DODeserializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_0DODeserializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_0DODeserializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_0DODeserializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_0DOSerializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_0DOSerializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_0DOSerializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_0DOSerializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_1DODeserializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_1DODeserializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_1DODeserializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_1DODeserializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_1DOSerializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_1DOSerializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_1DOSerializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXML1_1DOSerializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXMLDODeserializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXMLDODeserializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXMLDODeserializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXMLDODeserializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXMLDOSerializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXMLDOSerializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestFOXMLDOSerializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestFOXMLDOSerializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_0DODeserializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_0DODeserializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_0DODeserializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_0DODeserializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_0DOSerializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_0DOSerializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_0DOSerializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_0DOSerializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_1DODeserializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_1DODeserializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_1DODeserializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_1DODeserializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_1DOSerializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_1DOSerializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_1DOSerializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExt1_1DOSerializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExtDODeserializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExtDODeserializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExtDODeserializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExtDODeserializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExtDOSerializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExtDOSerializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExtDOSerializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestMETSFedoraExtDOSerializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestXMLDODeserializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestXMLDODeserializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestXMLDODeserializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestXMLDODeserializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TestXMLDOSerializer.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TestXMLDOSerializer.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TestXMLDOSerializer.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TestXMLDOSerializer.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/translation/TranslationTest.java b/fcrepo-server/src/test/java/fedora/server/storage/translation/TranslationTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/translation/TranslationTest.java rename to fcrepo-server/src/test/java/fedora/server/storage/translation/TranslationTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/storage/types/ObjectBuilder.java b/fcrepo-server/src/test/java/fedora/server/storage/types/ObjectBuilder.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/storage/types/ObjectBuilder.java rename to fcrepo-server/src/test/java/fedora/server/storage/types/ObjectBuilder.java diff --git a/fedorarepo-server/src/test/java/fedora/server/utilities/AllIntegrationTests.java b/fcrepo-server/src/test/java/fedora/server/utilities/AllIntegrationTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/utilities/AllIntegrationTests.java rename to fcrepo-server/src/test/java/fedora/server/utilities/AllIntegrationTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/utilities/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/utilities/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/utilities/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/utilities/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/utilities/DCFieldsTest.java b/fcrepo-server/src/test/java/fedora/server/utilities/DCFieldsTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/utilities/DCFieldsTest.java rename to fcrepo-server/src/test/java/fedora/server/utilities/DCFieldsTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/utilities/DerbyDDLConverterIntegrationTest.java b/fcrepo-server/src/test/java/fedora/server/utilities/DerbyDDLConverterIntegrationTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/utilities/DerbyDDLConverterIntegrationTest.java rename to fcrepo-server/src/test/java/fedora/server/utilities/DerbyDDLConverterIntegrationTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/utilities/Log4jConfigListenerTest.java b/fcrepo-server/src/test/java/fedora/server/utilities/Log4jConfigListenerTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/utilities/Log4jConfigListenerTest.java rename to fcrepo-server/src/test/java/fedora/server/utilities/Log4jConfigListenerTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/utilities/TestDateUtility.java b/fcrepo-server/src/test/java/fedora/server/utilities/TestDateUtility.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/utilities/TestDateUtility.java rename to fcrepo-server/src/test/java/fedora/server/utilities/TestDateUtility.java diff --git a/fedorarepo-server/src/test/java/fedora/server/validation/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/server/validation/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/validation/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/server/validation/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/server/validation/DOValidatorXMLSchemaTest.java b/fcrepo-server/src/test/java/fedora/server/validation/DOValidatorXMLSchemaTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/validation/DOValidatorXMLSchemaTest.java rename to fcrepo-server/src/test/java/fedora/server/validation/DOValidatorXMLSchemaTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/validation/MockTripleIterator.java b/fcrepo-server/src/test/java/fedora/server/validation/MockTripleIterator.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/validation/MockTripleIterator.java rename to fcrepo-server/src/test/java/fedora/server/validation/MockTripleIterator.java diff --git a/fedorarepo-server/src/test/java/fedora/server/validation/RelsValidatorTest.java b/fcrepo-server/src/test/java/fedora/server/validation/RelsValidatorTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/validation/RelsValidatorTest.java rename to fcrepo-server/src/test/java/fedora/server/validation/RelsValidatorTest.java diff --git a/fedorarepo-server/src/test/java/fedora/server/validation/ValidationUtilityTest.java b/fcrepo-server/src/test/java/fedora/server/validation/ValidationUtilityTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/server/validation/ValidationUtilityTest.java rename to fcrepo-server/src/test/java/fedora/server/validation/ValidationUtilityTest.java diff --git a/fedorarepo-server/src/test/java/fedora/utilities/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/utilities/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/utilities/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/utilities/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/utilities/NamespaceContextImplTest.java b/fcrepo-server/src/test/java/fedora/utilities/NamespaceContextImplTest.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/utilities/NamespaceContextImplTest.java rename to fcrepo-server/src/test/java/fedora/utilities/NamespaceContextImplTest.java diff --git a/fedorarepo-server/src/test/java/fedora/utilities/TestBase64.java b/fcrepo-server/src/test/java/fedora/utilities/TestBase64.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/utilities/TestBase64.java rename to fcrepo-server/src/test/java/fedora/utilities/TestBase64.java diff --git a/fedorarepo-server/src/test/java/fedora/utilities/TestFileUtils.java b/fcrepo-server/src/test/java/fedora/utilities/TestFileUtils.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/utilities/TestFileUtils.java rename to fcrepo-server/src/test/java/fedora/utilities/TestFileUtils.java diff --git a/fedorarepo-server/src/test/java/fedora/utilities/TestZip.java b/fcrepo-server/src/test/java/fedora/utilities/TestZip.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/utilities/TestZip.java rename to fcrepo-server/src/test/java/fedora/utilities/TestZip.java diff --git a/fedorarepo-server/src/test/java/fedora/utilities/install/container/AllUnitTests.java b/fcrepo-server/src/test/java/fedora/utilities/install/container/AllUnitTests.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/utilities/install/container/AllUnitTests.java rename to fcrepo-server/src/test/java/fedora/utilities/install/container/AllUnitTests.java diff --git a/fedorarepo-server/src/test/java/fedora/utilities/install/container/TestFedoraWebXML.java b/fcrepo-server/src/test/java/fedora/utilities/install/container/TestFedoraWebXML.java similarity index 96% rename from fedorarepo-server/src/test/java/fedora/utilities/install/container/TestFedoraWebXML.java rename to fcrepo-server/src/test/java/fedora/utilities/install/container/TestFedoraWebXML.java index 86464f10a..484706318 100644 --- a/fedorarepo-server/src/test/java/fedora/utilities/install/container/TestFedoraWebXML.java +++ b/fcrepo-server/src/test/java/fedora/utilities/install/container/TestFedoraWebXML.java @@ -25,7 +25,7 @@ public class TestFedoraWebXML { */ @Before public void setUp() throws Exception { - File f = new File("../fedorarepo-webapp/src/main/webapp/WEB-INF/web.xml"); + File f = new File("../fcrepo-webapp/src/main/webapp/WEB-INF/web.xml"); assertTrue("Couldn't find source web.xml file", f.exists()); webXMLFilePath = f.getAbsolutePath(); } diff --git a/fedorarepo-server/src/test/java/fedora/utilities/install/container/TestTomcatServerXML.java b/fcrepo-server/src/test/java/fedora/utilities/install/container/TestTomcatServerXML.java similarity index 100% rename from fedorarepo-server/src/test/java/fedora/utilities/install/container/TestTomcatServerXML.java rename to fcrepo-server/src/test/java/fedora/utilities/install/container/TestTomcatServerXML.java diff --git a/fedorarepo-server/src/test/java/mock/fedora/server/utilities/MockTableSpec.java b/fcrepo-server/src/test/java/mock/fedora/server/utilities/MockTableSpec.java similarity index 100% rename from fedorarepo-server/src/test/java/mock/fedora/server/utilities/MockTableSpec.java rename to fcrepo-server/src/test/java/mock/fedora/server/utilities/MockTableSpec.java diff --git a/fedorarepo-server/src/test/java/mock/sql/MockConnection.java b/fcrepo-server/src/test/java/mock/sql/MockConnection.java similarity index 100% rename from fedorarepo-server/src/test/java/mock/sql/MockConnection.java rename to fcrepo-server/src/test/java/mock/sql/MockConnection.java diff --git a/fedorarepo-server/src/test/java/mock/sql/MockDriver.java b/fcrepo-server/src/test/java/mock/sql/MockDriver.java similarity index 100% rename from fedorarepo-server/src/test/java/mock/sql/MockDriver.java rename to fcrepo-server/src/test/java/mock/sql/MockDriver.java diff --git a/fedorarepo-server/src/test/java/mock/sql/MockPreparedStatement.java b/fcrepo-server/src/test/java/mock/sql/MockPreparedStatement.java similarity index 100% rename from fedorarepo-server/src/test/java/mock/sql/MockPreparedStatement.java rename to fcrepo-server/src/test/java/mock/sql/MockPreparedStatement.java diff --git a/fedorarepo-server/src/test/java/mock/sql/MockStatement.java b/fcrepo-server/src/test/java/mock/sql/MockStatement.java similarity index 100% rename from fedorarepo-server/src/test/java/mock/sql/MockStatement.java rename to fcrepo-server/src/test/java/mock/sql/MockStatement.java diff --git a/fedorarepo-webadmin/pom.xml b/fcrepo-webadmin/pom.xml similarity index 88% rename from fedorarepo-webadmin/pom.xml rename to fcrepo-webadmin/pom.xml index 3a7baa667..dbac21b57 100644 --- a/fedorarepo-webadmin/pom.xml +++ b/fcrepo-webadmin/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - org.fedorarepo - fedorarepo-webadmin + org.fcrepo + fcrepo-webadmin swf 3.3-SNAPSHOT Fedora Web Administrator @@ -15,16 +15,16 @@ b) copy crossdomain.xml to that instance's ROOT webapp c) point browser to target/index.html To integrate: a) examine existing files and dirs in - fedorarepo-webapp/src/main/webapp/admin + fcrepo-webapp/src/main/webapp/admin b) for each one that already exists there, copy the corresponding one from target/ after a successful build - c) check built changes in to fedorarepo-webapp + c) check built changes in to fcrepo-webapp as indicated above anytime source in this module changes - TODO: Integrate this as a module of the parent fedorarepo project, + TODO: Integrate this as a module of the parent fcrepo project, and have its relevant target/ artifacts pulled in automatically - by the fedorarepo-webapp project. + by the fcrepo-webapp project. --> diff --git a/fedorarepo-webadmin/src/main/flex/DatastreamDialog.mxml b/fcrepo-webadmin/src/main/flex/DatastreamDialog.mxml similarity index 100% rename from fedorarepo-webadmin/src/main/flex/DatastreamDialog.mxml rename to fcrepo-webadmin/src/main/flex/DatastreamDialog.mxml diff --git a/fedorarepo-webadmin/src/main/flex/ExportDialog.mxml b/fcrepo-webadmin/src/main/flex/ExportDialog.mxml similarity index 100% rename from fedorarepo-webadmin/src/main/flex/ExportDialog.mxml rename to fcrepo-webadmin/src/main/flex/ExportDialog.mxml diff --git a/fedorarepo-webadmin/src/main/flex/FedoraAdministrator.mxml b/fcrepo-webadmin/src/main/flex/FedoraAdministrator.mxml similarity index 100% rename from fedorarepo-webadmin/src/main/flex/FedoraAdministrator.mxml rename to fcrepo-webadmin/src/main/flex/FedoraAdministrator.mxml diff --git a/fedorarepo-webadmin/src/main/flex/FileUploadDialog.mxml b/fcrepo-webadmin/src/main/flex/FileUploadDialog.mxml similarity index 100% rename from fedorarepo-webadmin/src/main/flex/FileUploadDialog.mxml rename to fcrepo-webadmin/src/main/flex/FileUploadDialog.mxml diff --git a/fedorarepo-webadmin/src/main/flex/LoginDialog.mxml b/fcrepo-webadmin/src/main/flex/LoginDialog.mxml similarity index 100% rename from fedorarepo-webadmin/src/main/flex/LoginDialog.mxml rename to fcrepo-webadmin/src/main/flex/LoginDialog.mxml diff --git a/fedorarepo-webadmin/src/main/flex/NewDatastreamDialog.mxml b/fcrepo-webadmin/src/main/flex/NewDatastreamDialog.mxml similarity index 100% rename from fedorarepo-webadmin/src/main/flex/NewDatastreamDialog.mxml rename to fcrepo-webadmin/src/main/flex/NewDatastreamDialog.mxml diff --git a/fedorarepo-webadmin/src/main/flex/ObjectTab.mxml b/fcrepo-webadmin/src/main/flex/ObjectTab.mxml similarity index 100% rename from fedorarepo-webadmin/src/main/flex/ObjectTab.mxml rename to fcrepo-webadmin/src/main/flex/ObjectTab.mxml diff --git a/fedorarepo-webadmin/src/main/flex/ObjectXMLDialog.mxml b/fcrepo-webadmin/src/main/flex/ObjectXMLDialog.mxml similarity index 100% rename from fedorarepo-webadmin/src/main/flex/ObjectXMLDialog.mxml rename to fcrepo-webadmin/src/main/flex/ObjectXMLDialog.mxml diff --git a/fedorarepo-webadmin/src/main/flex/ReplaceContentDialog.mxml b/fcrepo-webadmin/src/main/flex/ReplaceContentDialog.mxml similarity index 100% rename from fedorarepo-webadmin/src/main/flex/ReplaceContentDialog.mxml rename to fcrepo-webadmin/src/main/flex/ReplaceContentDialog.mxml diff --git a/fedorarepo-webadmin/src/main/flex/SearchTab.mxml b/fcrepo-webadmin/src/main/flex/SearchTab.mxml similarity index 100% rename from fedorarepo-webadmin/src/main/flex/SearchTab.mxml rename to fcrepo-webadmin/src/main/flex/SearchTab.mxml diff --git a/fedorarepo-webadmin/src/main/flex/script/Alerts.as b/fcrepo-webadmin/src/main/flex/script/Alerts.as similarity index 100% rename from fedorarepo-webadmin/src/main/flex/script/Alerts.as rename to fcrepo-webadmin/src/main/flex/script/Alerts.as diff --git a/fedorarepo-webadmin/src/main/flex/script/ErrorHandler.as b/fcrepo-webadmin/src/main/flex/script/ErrorHandler.as similarity index 100% rename from fedorarepo-webadmin/src/main/flex/script/ErrorHandler.as rename to fcrepo-webadmin/src/main/flex/script/ErrorHandler.as diff --git a/fedorarepo-webadmin/src/main/flex/script/Util.as b/fcrepo-webadmin/src/main/flex/script/Util.as similarity index 100% rename from fedorarepo-webadmin/src/main/flex/script/Util.as rename to fcrepo-webadmin/src/main/flex/script/Util.as diff --git a/fedorarepo-webadmin/src/main/flex/styles.css b/fcrepo-webadmin/src/main/flex/styles.css similarity index 100% rename from fedorarepo-webadmin/src/main/flex/styles.css rename to fcrepo-webadmin/src/main/flex/styles.css diff --git a/fedorarepo-webadmin/src/main/html-template/AC_OETags.js b/fcrepo-webadmin/src/main/html-template/AC_OETags.js similarity index 100% rename from fedorarepo-webadmin/src/main/html-template/AC_OETags.js rename to fcrepo-webadmin/src/main/html-template/AC_OETags.js diff --git a/fedorarepo-webadmin/src/main/html-template/crossdomain.xml b/fcrepo-webadmin/src/main/html-template/crossdomain.xml similarity index 100% rename from fedorarepo-webadmin/src/main/html-template/crossdomain.xml rename to fcrepo-webadmin/src/main/html-template/crossdomain.xml diff --git a/fedorarepo-webadmin/src/main/html-template/history/history.css b/fcrepo-webadmin/src/main/html-template/history/history.css similarity index 100% rename from fedorarepo-webadmin/src/main/html-template/history/history.css rename to fcrepo-webadmin/src/main/html-template/history/history.css diff --git a/fedorarepo-webadmin/src/main/html-template/history/history.js b/fcrepo-webadmin/src/main/html-template/history/history.js similarity index 100% rename from fedorarepo-webadmin/src/main/html-template/history/history.js rename to fcrepo-webadmin/src/main/html-template/history/history.js diff --git a/fedorarepo-webadmin/src/main/html-template/history/historyFrame.html b/fcrepo-webadmin/src/main/html-template/history/historyFrame.html similarity index 100% rename from fedorarepo-webadmin/src/main/html-template/history/historyFrame.html rename to fcrepo-webadmin/src/main/html-template/history/historyFrame.html diff --git a/fedorarepo-webadmin/src/main/html-template/index.template.html b/fcrepo-webadmin/src/main/html-template/index.template.html similarity index 100% rename from fedorarepo-webadmin/src/main/html-template/index.template.html rename to fcrepo-webadmin/src/main/html-template/index.template.html diff --git a/fedorarepo-webadmin/src/main/html-template/playerProductInstall.swf b/fcrepo-webadmin/src/main/html-template/playerProductInstall.swf similarity index 100% rename from fedorarepo-webadmin/src/main/html-template/playerProductInstall.swf rename to fcrepo-webadmin/src/main/html-template/playerProductInstall.swf diff --git a/fedorarepo-webadmin/src/main/html-template/upload/loading.gif b/fcrepo-webadmin/src/main/html-template/upload/loading.gif similarity index 100% rename from fedorarepo-webadmin/src/main/html-template/upload/loading.gif rename to fcrepo-webadmin/src/main/html-template/upload/loading.gif diff --git a/fedorarepo-webadmin/src/main/html-template/upload/upload.html b/fcrepo-webadmin/src/main/html-template/upload/upload.html similarity index 100% rename from fedorarepo-webadmin/src/main/html-template/upload/upload.html rename to fcrepo-webadmin/src/main/html-template/upload/upload.html diff --git a/fedorarepo-webapp/pom.xml b/fcrepo-webapp/pom.xml similarity index 94% rename from fedorarepo-webapp/pom.xml rename to fcrepo-webapp/pom.xml index 94e98bf92..f91fb433d 100644 --- a/fedorarepo-webapp/pom.xml +++ b/fcrepo-webapp/pom.xml @@ -2,16 +2,16 @@ 4.0.0 - org.fedorarepo - fedorarepo-webapp + org.fcrepo + fcrepo-webapp war 3.3-SNAPSHOT Fedora WAR http://duraspace.org - org.fedorarepo - fedorarepo + org.fcrepo + fcrepo 3.3-SNAPSHOT @@ -36,9 +36,9 @@ classpathref="maven.compile.classpath" dir="${project.build.outputDirectory}"> + value="${basedir}/../fcrepo-common/target/generated-sources/axistools/wsdl2java/fedora/server/management/deploy.wsdd" /> + value="${basedir}/../fcrepo-common/target/generated-sources/axistools/wsdl2java/fedora/server/access/deploy.wsdd" /> @@ -154,8 +154,8 @@ - org.fedorarepo - fedorarepo-server + org.fcrepo + fcrepo-server ${project.version} @@ -567,19 +567,19 @@ - org.fedorarepo + org.fcrepo axis 1.3-PATCHED - org.fedorarepo + org.fcrepo emory-util-remote 2.1 - org.fedorarepo + org.fcrepo GroboTestingJUnit-core 1.2.1 test @@ -587,50 +587,50 @@ - org.fedorarepo + org.fcrepo jakarta-oro 2.0.5 - org.fedorarepo + org.fcrepo openrdf-sesame-onejar 2.2.1 - org.fedorarepo + org.fcrepo mptstore 0.9.1 - org.fedorarepo + org.fcrepo saxon 9.0 - org.fedorarepo + org.fcrepo saxon-dom 9.0 - org.fedorarepo + org.fcrepo trippi-core 1.4.1 - org.fedorarepo + org.fcrepo trippi-mptstore 1.4.1 - org.fedorarepo + org.fcrepo trippi-mulgara 1.4.1 @@ -654,14 +654,14 @@ - org.fedorarepo - fedorarepo-common + org.fcrepo + fcrepo-common ${project.version} - org.fedorarepo - fedorarepo-common + org.fcrepo + fcrepo-common tests ${project.version} test @@ -705,26 +705,26 @@ - org.fedorarepo + org.fcrepo openrdf-sesame-onejar 2.2.1 - org.fedorarepo + org.fcrepo sunxacml 1.2-PATCHED - org.fedorarepo + org.fcrepo Tidy 1.0 - org.fedorarepo + org.fcrepo tt-bytecode 1.0 diff --git a/fedorarepo-webapp/src/main/resources/images/newlogo2.jpg b/fcrepo-webapp/src/main/resources/images/newlogo2.jpg similarity index 100% rename from fedorarepo-webapp/src/main/resources/images/newlogo2.jpg rename to fcrepo-webapp/src/main/resources/images/newlogo2.jpg diff --git a/fedorarepo-webapp/src/main/resources/ri/base.css b/fcrepo-webapp/src/main/resources/ri/base.css similarity index 100% rename from fedorarepo-webapp/src/main/resources/ri/base.css rename to fcrepo-webapp/src/main/resources/ri/base.css diff --git a/fedorarepo-webapp/src/main/resources/ri/error.xsl b/fcrepo-webapp/src/main/resources/ri/error.xsl similarity index 100% rename from fedorarepo-webapp/src/main/resources/ri/error.xsl rename to fcrepo-webapp/src/main/resources/ri/error.xsl diff --git a/fedorarepo-webapp/src/main/resources/ri/form.css b/fcrepo-webapp/src/main/resources/ri/form.css similarity index 100% rename from fedorarepo-webapp/src/main/resources/ri/form.css rename to fcrepo-webapp/src/main/resources/ri/form.css diff --git a/fedorarepo-webapp/src/main/resources/ri/form.xsl b/fcrepo-webapp/src/main/resources/ri/form.xsl similarity index 100% rename from fedorarepo-webapp/src/main/resources/ri/form.xsl rename to fcrepo-webapp/src/main/resources/ri/form.xsl diff --git a/fedorarepo-webapp/src/main/resources/ri/index.xsl b/fcrepo-webapp/src/main/resources/ri/index.xsl similarity index 100% rename from fedorarepo-webapp/src/main/resources/ri/index.xsl rename to fcrepo-webapp/src/main/resources/ri/index.xsl diff --git a/fedorarepo-webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/fcrepo-webapp/src/main/webapp/WEB-INF/classes/log4j.properties similarity index 100% rename from fedorarepo-webapp/src/main/webapp/WEB-INF/classes/log4j.properties rename to fcrepo-webapp/src/main/webapp/WEB-INF/classes/log4j.properties diff --git a/fedorarepo-webapp/src/main/webapp/WEB-INF/web.xml b/fcrepo-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from fedorarepo-webapp/src/main/webapp/WEB-INF/web.xml rename to fcrepo-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/fedorarepo-webapp/src/main/webapp/admin/AC_OETags.js b/fcrepo-webapp/src/main/webapp/admin/AC_OETags.js similarity index 100% rename from fedorarepo-webapp/src/main/webapp/admin/AC_OETags.js rename to fcrepo-webapp/src/main/webapp/admin/AC_OETags.js diff --git a/fedorarepo-webapp/src/main/webapp/admin/crossdomain.xml b/fcrepo-webapp/src/main/webapp/admin/crossdomain.xml similarity index 100% rename from fedorarepo-webapp/src/main/webapp/admin/crossdomain.xml rename to fcrepo-webapp/src/main/webapp/admin/crossdomain.xml diff --git a/fedorarepo-webapp/src/main/webapp/admin/fedorarepo-webadmin-3.3-SNAPSHOT.swf b/fcrepo-webapp/src/main/webapp/admin/fedorarepo-webadmin-3.3-SNAPSHOT.swf similarity index 100% rename from fedorarepo-webapp/src/main/webapp/admin/fedorarepo-webadmin-3.3-SNAPSHOT.swf rename to fcrepo-webapp/src/main/webapp/admin/fedorarepo-webadmin-3.3-SNAPSHOT.swf diff --git a/fedorarepo-webapp/src/main/webapp/admin/history/history.css b/fcrepo-webapp/src/main/webapp/admin/history/history.css similarity index 100% rename from fedorarepo-webapp/src/main/webapp/admin/history/history.css rename to fcrepo-webapp/src/main/webapp/admin/history/history.css diff --git a/fedorarepo-webapp/src/main/webapp/admin/history/history.js b/fcrepo-webapp/src/main/webapp/admin/history/history.js similarity index 100% rename from fedorarepo-webapp/src/main/webapp/admin/history/history.js rename to fcrepo-webapp/src/main/webapp/admin/history/history.js diff --git a/fedorarepo-webapp/src/main/webapp/admin/history/historyFrame.html b/fcrepo-webapp/src/main/webapp/admin/history/historyFrame.html similarity index 100% rename from fedorarepo-webapp/src/main/webapp/admin/history/historyFrame.html rename to fcrepo-webapp/src/main/webapp/admin/history/historyFrame.html diff --git a/fedorarepo-webapp/src/main/webapp/admin/index.html b/fcrepo-webapp/src/main/webapp/admin/index.html similarity index 91% rename from fedorarepo-webapp/src/main/webapp/admin/index.html rename to fcrepo-webapp/src/main/webapp/admin/index.html index d46ad9476..ed85826bc 100644 --- a/fedorarepo-webapp/src/main/webapp/admin/index.html +++ b/fcrepo-webapp/src/main/webapp/admin/index.html @@ -108,10 +108,10 @@ "width", "100%", "height", "100%", "align", "middle", - "id", "fedorarepo-webadmin", + "id", "fcrepo-webadmin", "quality", "high", "bgcolor", "#ffffff", - "name", "fedorarepo-webadmin", + "name", "fcrepo-webadmin", "allowScriptAccess","sameDomain", "type", "application/x-shockwave-flash", "pluginspage", "http://www.adobe.com/go/getflashplayer" @@ -120,14 +120,14 @@ // if we've detected an acceptable version // embed the Flash Content SWF when all tests are passed AC_FL_RunContent( - "src", "fedorarepo-webadmin-3.3-SNAPSHOT", + "src", "fcrepo-webadmin-3.3-SNAPSHOT", "width", "100%", "height", "100%", "align", "middle", - "id", "fedorarepo-webadmin", + "id", "fcrepo-webadmin", "quality", "high", "bgcolor", "#ffffff", - "name", "fedorarepo-webadmin", + "name", "fcrepo-webadmin", "allowScriptAccess","sameDomain", "type", "application/x-shockwave-flash", "pluginspage", "http://www.adobe.com/go/getflashplayer" @@ -142,14 +142,14 @@