From 44146a8b1a2db529d1b143c17fef8f1ef4b4882c Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 3 Jul 2018 09:51:54 -0700 Subject: [PATCH 1/2] SHIBUI-646 Fixed default route with redirect --- ui/src/app/app.routing.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/app/app.routing.ts b/ui/src/app/app.routing.ts index 3de190469..9903039c9 100644 --- a/ui/src/app/app.routing.ts +++ b/ui/src/app/app.routing.ts @@ -3,6 +3,7 @@ import { Routes, RouterModule } from '@angular/router'; const routes: Routes = [ { path: '', redirectTo: 'metadata', pathMatch: 'full' }, + { path: 'dashboard', redirectTo: 'metadata', pathMatch: 'full' }, { path: 'metadata', loadChildren: './metadata/metadata.module#MetadataModule' From 38466de34761ddb57483e03e02e23465bcaec537 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Tue, 3 Jul 2018 13:22:17 -0700 Subject: [PATCH 2/2] [NOJIRA] Added a logger to TestConfiguration. Updated incommon-short to be valid until 2099. --- .../shibboleth/admin/ui/configuration/TestConfiguration.groovy | 3 +++ backend/src/test/resources/metadata/incommon-short.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy index 7296a2063..73cf58307 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy @@ -12,6 +12,8 @@ import org.apache.lucene.index.IndexWriter import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver import org.opensaml.saml.metadata.resolver.MetadataResolver import org.opensaml.saml.metadata.resolver.impl.ResourceBackedMetadataResolver +import org.slf4j.Logger +import org.slf4j.LoggerFactory import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.core.io.ClassPathResource @@ -21,6 +23,7 @@ class TestConfiguration { final OpenSamlObjects openSamlObjects final IndexWriter indexWriter final MetadataResolverRepository metadataResolverRepository + final Logger logger = LoggerFactory.getLogger(TestConfiguration.class); TestConfiguration(final OpenSamlObjects openSamlObjects, final IndexWriter indexWriter, final MetadataResolverRepository metadataResolverRepository) { this.openSamlObjects =openSamlObjects diff --git a/backend/src/test/resources/metadata/incommon-short.xml b/backend/src/test/resources/metadata/incommon-short.xml index c807cf343..e8c214173 100644 --- a/backend/src/test/resources/metadata/incommon-short.xml +++ b/backend/src/test/resources/metadata/incommon-short.xml @@ -1,5 +1,5 @@ - +