[java-identity-provider] branch main updated: JSPROF-1 - Move RelyingParty "layer" into java-shib-profile
Scott Cantor
cantor.2 at osu.edu
Tue Feb 21 15:09:35 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5863f034066286d4d9de1da22e55fc53808f5357
The following commit(s) were added to refs/heads/main by this push:
new 5863f0340 JSPROF-1 - Move RelyingParty "layer" into java-shib-profile
5863f0340 is described below
commit 5863f034066286d4d9de1da22e55fc53808f5357
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 21 10:09:32 2023 -0500
JSPROF-1 - Move RelyingParty "layer" into java-shib-profile
https://shibboleth.atlassian.net/browse/JSPROF-1
Move ArtifactAware interfaces and classes out.
---
.../shibboleth/idp/conf/relying-party-mddriven.xml | 6 +-
.../shibboleth/idp/conf/relying-party-system.xml | 2 +-
.../config/BasicSAMLArtifactConfiguration.java | 103 ---------------------
.../SAMLArtifactAwareProfileConfiguration.java | 37 --------
.../profile/config/SAMLArtifactConfiguration.java | 50 ----------
...ractSAML1ArtifactAwareProfileConfiguration.java | 4 +-
...ractSAML2ArtifactAwareProfileConfiguration.java | 4 +-
.../config/BasicSAMLArtifactConfigurationTest.java | 63 -------------
.../AttributeQueryProfileConfigurationTest.java | 4 +-
.../config/BrowserSSOProfileConfigurationTest.java | 4 +-
.../AttributeQueryProfileConfigurationTest.java | 4 +-
.../config/BrowserSSOProfileConfigurationTest.java | 4 +-
.../SingleLogoutProfileConfigurationTest.java | 4 +-
.../impl/PopulateBindingAndEndpointContexts.java | 4 +-
14 files changed, 20 insertions(+), 273 deletions(-)
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml
index 4597e0a8b..f8b5b231b 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml
@@ -272,7 +272,7 @@
p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration">
<property name="artifactConfigurationLookupStrategy">
<bean parent="shibboleth.MDDrivenBeanProperty" p:propertyName="artifactConfiguration"
- p:propertyType="#{T(net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration)}" />
+ p:propertyType="#{T(net.shibboleth.saml.profile.config.SAMLArtifactConfiguration)}" />
</property>
<property name="signResponsesPredicate">
<bean class="net.shibboleth.shared.logic.PredicateSupport" factory-method="fromFunction">
@@ -362,7 +362,7 @@
p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration">
<property name="artifactConfigurationLookupStrategy">
<bean parent="shibboleth.MDDrivenBeanProperty" p:propertyName="artifactConfiguration"
- p:propertyType="#{T(net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration)}" />
+ p:propertyType="#{T(net.shibboleth.saml.profile.config.SAMLArtifactConfiguration)}" />
</property>
<property name="signArtifactRequestsPredicate">
<bean class="net.shibboleth.shared.logic.PredicateSupport" factory-method="fromFunction">
@@ -554,7 +554,7 @@
p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration">
<property name="artifactConfigurationLookupStrategy">
<bean parent="shibboleth.MDDrivenBeanProperty" p:propertyName="artifactConfiguration"
- p:propertyType="#{T(net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration)}" />
+ p:propertyType="#{T(net.shibboleth.saml.profile.config.SAMLArtifactConfiguration)}" />
</property>
<property name="signArtifactRequestsPredicate">
<bean class="net.shibboleth.shared.logic.PredicateSupport" factory-method="fromFunction">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
index e1698bddb..025e29779 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
@@ -145,7 +145,7 @@
<!-- Artifact Configuration Defaults -->
<bean id="shibboleth.DefaultArtifactConfiguration"
- class="net.shibboleth.idp.saml.profile.config.BasicSAMLArtifactConfiguration"
+ class="net.shibboleth.saml.profile.config.BasicSAMLArtifactConfiguration"
p:artifactResolutionServiceIndex="%{idp.artifact.endpointIndex:2}" />
<!--
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BasicSAMLArtifactConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BasicSAMLArtifactConfiguration.java
deleted file mode 100644
index db7d88b3c..000000000
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BasicSAMLArtifactConfiguration.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.profile.config;
-
-import java.nio.ByteBuffer;
-
-import javax.annotation.Nullable;
-
-import net.shibboleth.shared.logic.ConstraintViolationException;
-import net.shibboleth.shared.primitive.StringSupport;
-
-/**
- * Interface for outbound SAML artifact configuration.
- *
- * <p>While sufficient for known SAML 1 and 2 artifact types, the interface
- * may be extended if necessary to carry type-specific additions.</p>
- */
-public class BasicSAMLArtifactConfiguration implements SAMLArtifactConfiguration {
-
- /** The artifact type code. */
- @Nullable private byte[] artifactType;
-
- /** The artifact resolution URL. */
- @Nullable private String artifactResolutionURL;
-
- /** The artifact resolution index. */
- @Nullable private Integer artifactResolutionIndex;
-
- /** {@inheritDoc} */
- @Override
- @Nullable public byte[] getArtifactType() {
- return artifactType;
- }
-
- /**
- * Set the type code of the artifact to use.
- *
- * @param type type code of artifact
- */
- public void setArtifactType(@Nullable final Integer type) {
- if (type == null) {
- artifactType = null;
- } else {
- if (type <= 0) {
- throw new ConstraintViolationException("Artifact type code must be positive");
- } else if (type > 32767) {
- throw new ConstraintViolationException("Artifact type code must fit in two bytes");
- }
-
- final byte[] typeCode = ByteBuffer.allocate(4).putInt(type).array();
- final byte[] atype = new byte[2];
- atype[0] = typeCode[2];
- atype[1] = typeCode[3];
- artifactType = atype;
- }
- }
-
- /** {@inheritDoc} */
- @Override
- @Nullable public String getArtifactResolutionServiceURL() {
- return artifactResolutionURL;
- }
-
- /**
- * Set the location, as a URL, of the issuer's resolution service endpoint.
- *
- * @param url location of the resolution service endpoint
- */
- public void setArtifactResolutionServiceURL(@Nullable final String url) {
- artifactResolutionURL = StringSupport.trimOrNull(url);
- }
-
- /** {@inheritDoc} */
- @Override
- @Nullable public Integer getArtifactResolutionServiceIndex() {
- return artifactResolutionIndex;
- }
-
- /**
- * Set the index of the issuer's resolution service endpoint, corresponding to its metadata.
- *
- * @param index index of resolution service endpoint
- */
- public void setArtifactResolutionServiceIndex(@Nullable final Integer index) {
- artifactResolutionIndex = index;
- }
-
-}
\ No newline at end of file
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactAwareProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactAwareProfileConfiguration.java
deleted file mode 100644
index d571a98fc..000000000
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactAwareProfileConfiguration.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.profile.config;
-
-import javax.annotation.Nullable;
-
-import org.opensaml.profile.context.ProfileRequestContext;
-
-/** Common interface for SAML profile configurations involving artifact production. */
-public interface SAMLArtifactAwareProfileConfiguration extends SAMLProfileConfiguration {
-
- /**
- * Get the associated {@link SAMLArtifactConfiguration} for the profile, if any.
- *
- * @param profileRequestContext current profile request context
- *
- * @return an associated artifact configuration, or null
- */
- @Nullable SAMLArtifactConfiguration getArtifactConfiguration(
- @Nullable final ProfileRequestContext profileRequestContext);
-
-}
\ No newline at end of file
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactConfiguration.java
deleted file mode 100644
index fda5af020..000000000
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactConfiguration.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.profile.config;
-
-import javax.annotation.Nullable;
-
-/**
- * Interface for outbound SAML artifact configuration.
- *
- * <p>While sufficient for known SAML 1 and 2 artifact types, the interface
- * may be extended if necessary to carry type-specific additions.</p>
- */
-public interface SAMLArtifactConfiguration {
-
- /**
- * Get the type code of the artifact to use.
- *
- * @return the artifact type code
- */
- @Nullable byte[] getArtifactType();
-
- /**
- * Get the location, as a URL, of the issuer's resolution service endpoint.
- *
- * @return location of resolution service endpoint
- */
- @Nullable String getArtifactResolutionServiceURL();
-
- /**
- * Get the index of the issuer's resolution service endpoint, corresponding to its metadata.
- *
- * @return index of resolution service endpoint in metadata
- */
- @Nullable Integer getArtifactResolutionServiceIndex();
-}
\ No newline at end of file
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AbstractSAML1ArtifactAwareProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AbstractSAML1ArtifactAwareProfileConfiguration.java
index 06c6ad5b5..e435114d7 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AbstractSAML1ArtifactAwareProfileConfiguration.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AbstractSAML1ArtifactAwareProfileConfiguration.java
@@ -25,8 +25,8 @@ import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.saml.profile.config.AbstractSAMLProfileConfiguration;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactAwareProfileConfiguration;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.SAMLArtifactAwareProfileConfiguration;
+import net.shibboleth.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.logic.FunctionSupport;
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AbstractSAML2ArtifactAwareProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AbstractSAML2ArtifactAwareProfileConfiguration.java
index 37f02b378..5ec92e0aa 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AbstractSAML2ArtifactAwareProfileConfiguration.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AbstractSAML2ArtifactAwareProfileConfiguration.java
@@ -27,8 +27,8 @@ import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.logic.NoIntegrityMessageChannelPredicate;
import org.opensaml.profile.context.ProfileRequestContext;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactAwareProfileConfiguration;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.SAMLArtifactAwareProfileConfiguration;
+import net.shibboleth.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.saml.profile.config.SAMLArtifactConsumerProfileConfiguration;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.logic.Constraint;
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/BasicSAMLArtifactConfigurationTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/BasicSAMLArtifactConfigurationTest.java
deleted file mode 100644
index 8dfad2a57..000000000
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/BasicSAMLArtifactConfigurationTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.profile.config;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/** Unit test for {@link BasicSAMLArtifactConfiguration}. */
- at SuppressWarnings("javadoc")
-public class BasicSAMLArtifactConfigurationTest {
-
- @Test public void testArtifactType() {
- BasicSAMLArtifactConfiguration config = new BasicSAMLArtifactConfiguration();
-
- Assert.assertNull(config.getArtifactType());
-
- config.setArtifactType(1);
- Assert.assertEquals(config.getArtifactType(), new byte[] {0x0, 0x1});
-
- config.setArtifactType(null);
- Assert.assertNull(config.getArtifactType());
- }
-
- @Test public void testURL() {
- BasicSAMLArtifactConfiguration config = new BasicSAMLArtifactConfiguration();
-
- Assert.assertNull(config.getArtifactResolutionServiceURL());
-
- config.setArtifactResolutionServiceURL("https://idp.example.org/artifact");
- Assert.assertEquals(config.getArtifactResolutionServiceURL(), "https://idp.example.org/artifact");
-
- config.setArtifactResolutionServiceURL(" ");
- Assert.assertNull(config.getArtifactResolutionServiceURL());
- }
-
- @Test public void testIndex() {
- BasicSAMLArtifactConfiguration config = new BasicSAMLArtifactConfiguration();
-
- Assert.assertNull(config.getArtifactResolutionServiceIndex());
-
- config.setArtifactResolutionServiceIndex(1);
- Assert.assertEquals(config.getArtifactResolutionServiceIndex(), Integer.valueOf(1));
-
- config.setArtifactResolutionServiceIndex(null);
- Assert.assertNull(config.getArtifactResolutionServiceIndex());
- }
-
-}
\ No newline at end of file
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/config/AttributeQueryProfileConfigurationTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/config/AttributeQueryProfileConfigurationTest.java
index 88e27e714..a5c7a024b 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/config/AttributeQueryProfileConfigurationTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/config/AttributeQueryProfileConfigurationTest.java
@@ -17,8 +17,8 @@
package net.shibboleth.idp.saml.saml1.profile.config;
-import net.shibboleth.idp.saml.profile.config.BasicSAMLArtifactConfiguration;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.BasicSAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.shared.logic.FunctionSupport;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/config/BrowserSSOProfileConfigurationTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/config/BrowserSSOProfileConfigurationTest.java
index 17d72485e..2a6e53dbf 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/config/BrowserSSOProfileConfigurationTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/config/BrowserSSOProfileConfigurationTest.java
@@ -18,8 +18,8 @@
package net.shibboleth.idp.saml.saml1.profile.config;
import net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal;
-import net.shibboleth.idp.saml.profile.config.BasicSAMLArtifactConfiguration;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.BasicSAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.logic.FunctionSupport;
import net.shibboleth.shared.logic.PredicateSupport;
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfigurationTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfigurationTest.java
index 7ad59124b..a0dc5d69b 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfigurationTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfigurationTest.java
@@ -20,8 +20,8 @@ package net.shibboleth.idp.saml.saml2.profile.config;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.idp.saml.profile.config.BasicSAMLArtifactConfiguration;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.BasicSAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.shared.logic.FunctionSupport;
/** Unit test for {@link AttributeQueryProfileConfiguration}. */
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfigurationTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfigurationTest.java
index 2170ffb27..e0d986e79 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfigurationTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfigurationTest.java
@@ -18,8 +18,8 @@
package net.shibboleth.idp.saml.saml2.profile.config;
import net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal;
-import net.shibboleth.idp.saml.profile.config.BasicSAMLArtifactConfiguration;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.BasicSAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.logic.FunctionSupport;
import net.shibboleth.shared.logic.PredicateSupport;
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfigurationTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfigurationTest.java
index 64abe2101..2c97c32fe 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfigurationTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfigurationTest.java
@@ -20,8 +20,8 @@ package net.shibboleth.idp.saml.saml2.profile.config;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.idp.saml.profile.config.BasicSAMLArtifactConfiguration;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.BasicSAMLArtifactConfiguration;
+import net.shibboleth.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.shared.logic.FunctionSupport;
/** Unit test for {@link SingleLogoutProfileConfiguration}. */
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/PopulateBindingAndEndpointContexts.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/PopulateBindingAndEndpointContexts.java
index 2bf21955b..d55ca5150 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/PopulateBindingAndEndpointContexts.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/PopulateBindingAndEndpointContexts.java
@@ -55,11 +55,11 @@ import org.opensaml.saml.saml2.metadata.RoleDescriptor;
import org.slf4j.Logger;
import net.shibboleth.idp.profile.AbstractProfileAction;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactAwareProfileConfiguration;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.idp.saml.profile.config.SAMLProfileConfiguration;
import net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration;
import net.shibboleth.profile.context.RelyingPartyContext;
+import net.shibboleth.saml.profile.config.SAMLArtifactAwareProfileConfiguration;
+import net.shibboleth.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list