diff --git a/pass-deposit-services/deposit-core/src/main/java/org/eclipse/pass/deposit/model/Packager.java b/pass-deposit-services/deposit-core/src/main/java/org/eclipse/pass/deposit/model/Packager.java index ef535042..8d60b1f7 100644 --- a/pass-deposit-services/deposit-core/src/main/java/org/eclipse/pass/deposit/model/Packager.java +++ b/pass-deposit-services/deposit-core/src/main/java/org/eclipse/pass/deposit/model/Packager.java @@ -25,6 +25,7 @@ import org.eclipse.pass.deposit.assembler.PackageOptions; import org.eclipse.pass.deposit.config.repository.AssemblerOptions; import org.eclipse.pass.deposit.config.repository.RepositoryConfig; +import org.eclipse.pass.deposit.config.repository.RepositoryDepositConfig; import org.eclipse.pass.deposit.service.DepositTask; import org.eclipse.pass.deposit.status.DepositStatusProcessor; import org.eclipse.pass.deposit.transport.Transport; @@ -133,6 +134,10 @@ public Map getConfiguration() { return repositoryConfig.getTransportConfig().getProtocolBinding().asPropertiesMap(); } + public RepositoryDepositConfig getRepositoryConfig() { + return repositoryConfig.getRepositoryDepositConfig(); + } + /** * The {@link DepositStatusProcessor}, may be {@code null}. * diff --git a/pass-deposit-services/deposit-core/src/main/java/org/eclipse/pass/deposit/service/DepositTask.java b/pass-deposit-services/deposit-core/src/main/java/org/eclipse/pass/deposit/service/DepositTask.java index a47a7565..eecf628b 100644 --- a/pass-deposit-services/deposit-core/src/main/java/org/eclipse/pass/deposit/service/DepositTask.java +++ b/pass-deposit-services/deposit-core/src/main/java/org/eclipse/pass/deposit/service/DepositTask.java @@ -424,8 +424,15 @@ static Function performDeposit(DepositWorkerContext try { packager = dc.packager(); + + packageStream = packager.getAssembler().assemble( dc.depositSubmission(), packager.getAssemblerOptions()); + //TODO add options for the packager.getRepoConfig + /* + packageStream = packager.getAssembler().assemble( + dc.depositSubmission(), packager.getAssemblerOptions(), packager.getRepositoryOptions()); + */ packagerConfig = packager.getConfiguration(); } catch (Exception e) { throw new RuntimeException("Error resolving a Packager or Packager configuration for " +