[java-sp-server] branch main updated: Refresh source tree after code refactoring.
Scott Cantor
cantor.2 at osu.edu
Tue Oct 18 15:07:52 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-sp-server.
View the commit online:
http://git.shibboleth.net/view/?p=java-sp-server.git;a=commit;h=c7278cfcf0a2cc55214a5ad14b33a74c593e17fc
The following commit(s) were added to refs/heads/main by this push:
new c7278cf Refresh source tree after code refactoring.
c7278cf is described below
commit c7278cfcf0a2cc55214a5ad14b33a74c593e17fc
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Oct 18 11:07:49 2022 -0400
Refresh source tree after code refactoring.
---
pom.xml | 40 ++++++++++++++--------
sp-conf-impl/pom.xml | 7 ++--
.../net/shibboleth/sp/conf/conditions.xml | 16 ++++-----
.../resources/net/shibboleth/sp/conf/functions.xml | 26 +++++++-------
.../net/shibboleth/sp/conf/global-system.xml | 24 ++++++-------
.../net/shibboleth/sp/conf/http-client.xml | 6 ++--
.../net/shibboleth/sp/conf/integration.xml | 6 ++--
.../net/shibboleth/sp/conf/primitives.xml | 2 +-
.../resources/net/shibboleth/sp/conf/sealer.xml | 4 +--
.../net/shibboleth/sp/conf/services-system.xml | 4 +--
sp-conf/pom.xml | 5 ++-
sp-server-api/pom.xml | 32 +++++++++++++++--
.../main/java/net/shibboleth/sp/Application.java | 19 ++++++----
.../ddf/ByteArrayToDDFConverter.java | 2 +-
.../{utilities/java/support => sp}/ddf/DDF.java | 13 +++----
.../java/support => sp}/ddf/DDFSupport.java | 8 ++---
.../ddf/DDFToByteArrayConverter.java | 2 +-
.../ddf/RemotedHttpServletRequest.java | 10 +++---
.../ddf/RemotedHttpServletResponse.java | 8 ++---
.../java/support => sp}/ddf/package-info.java | 2 +-
.../shibboleth/sp/remoting/AbstractEndpoint.java | 9 +++--
.../sp/remoting/ApplicationEndpoint.java | 4 +--
.../sp/remoting/ApplicationEndpointManager.java | 11 +++---
.../java/net/shibboleth/sp/remoting/Endpoint.java | 4 +--
.../shibboleth/sp/remoting/EndpointManager.java | 11 +++---
.../java/support => sp}/ddf/DDFSupportTest.java | 11 +++---
.../java/support => sp}/ddf/DDFTest.java | 7 ++--
.../ddf/RemotedHttpServletRequestTest.java | 4 +--
.../ddf/RemotedHttpServletResponseTest.java | 4 +--
.../resources/net/shibboleth/sp/ddf/empty-name.ddf | 1 +
.../net/shibboleth/sp/ddf/empty-noname.ddf | 1 +
.../resources/net/shibboleth/sp/ddf/float-name.ddf | 1 +
.../resources/net/shibboleth/sp/ddf/int-name.ddf | 1 +
.../resources/net/shibboleth/sp/ddf/long-name.ddf | 1 +
.../net/shibboleth/sp/ddf/string-name.ddf | 1 +
.../net/shibboleth/sp/ddf/struct-complex.ddf | 6 ++++
.../net/shibboleth/sp/ddf/struct-empty.ddf | 1 +
.../net/shibboleth/sp/ddf/unsafestring-name.ddf | 1 +
.../test/resources/net/shibboleth/sp/ddf/zork.xml | 5 +++
sp-server-impl/pom.xml | 2 +-
.../net/shibboleth/sp/impl/BasicApplication.java | 12 +++----
.../net/shibboleth/sp/impl/OpenSAMLConfigBean.java | 8 ++---
.../shibboleth/sp/remoting/endpoint/impl/Echo.java | 4 +--
.../shibboleth/sp/remoting/endpoint/impl/Ping.java | 4 +--
.../sp/remoting/endpoint/impl/XMLParser.java | 18 +++++-----
.../impl/BasicApplicationEndpointManager.java | 6 ++--
.../sp/remoting/impl/BasicEndpointManager.java | 6 ++--
.../sp/remoting/impl/ErrorTransformer.java | 2 +-
.../sp/remoting/impl/ReloadingEndpointManager.java | 8 ++---
.../sp/remoting/impl/RequestProcessor.java | 16 ++++-----
.../tcp/impl/TCPConnectionInterceptorFactory.java | 4 +--
.../PropertiesApplicationContextInitializer.java | 2 +-
.../sp/remoting/endpoint/impl/XMLParserTest.java | 8 ++---
53 files changed, 239 insertions(+), 181 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2fbca85..9f282f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,10 @@
<packaging>pom</packaging>
<properties>
+ <shib-attribute.version>5.0.0-SNAPSHOT</shib-attribute.version>
+ <shib-metadata.version>5.0.0-SNAPSHOT</shib-metadata.version>
<opensaml.version>5.0.0-SNAPSHOT</opensaml.version>
- <spring-extensions.version>9.0.0-SNAPSHOT</spring-extensions.version>
- <java-support.version>9.0.0-SNAPSHOT</java-support.version>
+ <shib-shared.version>9.0.0-SNAPSHOT</shib-shared.version>
<spring-int.version>5.5.11</spring-int.version>
<checkstyle.configLocation>${project.basedir}/resources/checkstyle.xml</checkstyle.configLocation>
</properties>
@@ -90,6 +91,20 @@
</dependencies>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-attribute-bom</artifactId>
+ <version>${shib-attribute.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-metadata-bom</artifactId>
+ <version>${shib-metadata.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-bom</artifactId>
@@ -97,6 +112,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-shared-bom</artifactId>
+ <version>${shib-shared.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
@@ -104,19 +126,9 @@
<scope>import</scope>
<type>pom</type>
</dependency>
+
<!-- Compile Dependencies -->
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>spring-extensions</artifactId>
- <version>${spring-extensions.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>.net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <version>${java-support.version}</version>
- <scope>compile</scope>
- </dependency>
+
<!-- Test Dependencies -->
</dependencies>
</dependencyManagement>
diff --git a/sp-conf-impl/pom.xml b/sp-conf-impl/pom.xml
index 7d2051a..bcf99b4 100644
--- a/sp-conf-impl/pom.xml
+++ b/sp-conf-impl/pom.xml
@@ -35,14 +35,13 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- <version>${spring-extensions.version}</version>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-spring</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/conditions.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/conditions.xml
index c1c71b4..e5fcc9a 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/conditions.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/conditions.xml
@@ -18,22 +18,22 @@
class="com.google.common.base.Predicates" factory-method="alwaysTrue" />
<bean id="shibboleth.Conditions.AND"
- class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="and" abstract="true" />
+ class="net.shibboleth.shared.logic.PredicateSupport" factory-method="and" abstract="true" />
<bean id="shibboleth.Conditions.NOT"
- class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="not" abstract="true" />
+ class="net.shibboleth.shared.logic.PredicateSupport" factory-method="not" abstract="true" />
<bean id="shibboleth.Conditions.OR"
- class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="or" abstract="true" />
+ class="net.shibboleth.shared.logic.PredicateSupport" factory-method="or" abstract="true" />
<bean id="shibboleth.BiConditions.AND"
- class="net.shibboleth.utilities.java.support.logic.BiPredicateSupport" factory-method="and" abstract="true" />
+ class="net.shibboleth.shared.logic.BiPredicateSupport" factory-method="and" abstract="true" />
<bean id="shibboleth.BiConditions.NOT"
- class="net.shibboleth.utilities.java.support.logic.BiPredicateSupport" factory-method="not" abstract="true" />
+ class="net.shibboleth.shared.logic.BiPredicateSupport" factory-method="not" abstract="true" />
<bean id="shibboleth.BiConditions.OR"
- class="net.shibboleth.utilities.java.support.logic.BiPredicateSupport" factory-method="or" abstract="true" />
+ class="net.shibboleth.shared.logic.BiPredicateSupport" factory-method="or" abstract="true" />
<bean id="shibboleth.BiConditions.Scripted"
- class="net.shibboleth.utilities.java.support.logic.ScriptedBiPredicate" abstract="true" />
+ class="net.shibboleth.shared.logic.ScriptedBiPredicate" abstract="true" />
<bean id="shibboleth.BiConditions.Expression"
- class="net.shibboleth.ext.spring.util.SpringExpressionBiPredicate" abstract="true" />
+ class="net.shibboleth.shared.spring.expression.SpringExpressionBiPredicate" abstract="true" />
</beans>
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/functions.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/functions.xml
index 3fe2440..2283cff 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/functions.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/functions.xml
@@ -13,35 +13,35 @@
default-destroy-method="destroy">
<bean id="shibboleth.Functions.Constant"
- class="net.shibboleth.utilities.java.support.logic.FunctionSupport" factory-method="constant" abstract="true" />
+ class="net.shibboleth.shared.logic.FunctionSupport" factory-method="constant" abstract="true" />
<bean id="shibboleth.Functions.Compose"
- class="net.shibboleth.utilities.java.support.logic.FunctionSupport" factory-method="compose" abstract="true" />
+ class="net.shibboleth.shared.logic.FunctionSupport" factory-method="compose" abstract="true" />
<bean id="shibboleth.Functions.PredicateDriven"
- class="net.shibboleth.utilities.java.support.logic.PredicateDrivenFunction" abstract="true" />
+ class="net.shibboleth.shared.logic.PredicateDrivenFunction" abstract="true" />
<bean id="shibboleth.Functions.Scripted"
- class="net.shibboleth.utilities.java.support.logic.ScriptedFunction" abstract="true" />
+ class="net.shibboleth.shared.logic.ScriptedFunction" abstract="true" />
<bean id="shibboleth.Functions.Expression"
- class="net.shibboleth.ext.spring.util.SpringExpressionFunction" abstract="true" />
+ class="net.shibboleth.shared.spring.expression.SpringExpressionFunction" abstract="true" />
<bean id="shibboleth.BiFunctions.Constant"
- class="net.shibboleth.utilities.java.support.logic.BiFunctionSupport" factory-method="constant" abstract="true" />
+ class="net.shibboleth.shared.logic.BiFunctionSupport" factory-method="constant" abstract="true" />
<bean id="shibboleth.BiFunctions.Compose"
- class="net.shibboleth.utilities.java.support.logic.BiFunctionSupport" factory-method="compose" abstract="true" />
+ class="net.shibboleth.shared.logic.BiFunctionSupport" factory-method="compose" abstract="true" />
<bean id="shibboleth.BiFunctions.Scripted"
- class="net.shibboleth.utilities.java.support.logic.ScriptedBiFunction" abstract="true" />
+ class="net.shibboleth.shared.logic.ScriptedBiFunction" abstract="true" />
<bean id="shibboleth.BiFunctions.Expression"
- class="net.shibboleth.ext.spring.util.SpringExpressionBiFunction" abstract="true" />
+ class="net.shibboleth.shared.spring.expression.SpringExpressionBiFunction" abstract="true" />
<bean id="shibboleth.Consumers.Scripted"
- class="net.shibboleth.utilities.java.support.logic.ScriptedConsumer" abstract="true" />
+ class="net.shibboleth.shared.logic.ScriptedConsumer" abstract="true" />
<bean id="shibboleth.Consumers.Expression"
- class="net.shibboleth.ext.spring.util.SpringExpressionConsumer" abstract="true" />
+ class="net.shibboleth.shared.spring.expression.SpringExpressionConsumer" abstract="true" />
<bean id="shibboleth.BiConsumers.Scripted"
- class="net.shibboleth.utilities.java.support.logic.ScriptedBiConsumer" abstract="true" />
+ class="net.shibboleth.shared.logic.ScriptedBiConsumer" abstract="true" />
<bean id="shibboleth.BiConsumers.Expression"
- class="net.shibboleth.ext.spring.util.SpringExpressionBiConsumer" abstract="true" />
+ class="net.shibboleth.shared.spring.expression.SpringExpressionBiConsumer" abstract="true" />
</beans>
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/global-system.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/global-system.xml
index bbe35dd..c3f7855 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/global-system.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/global-system.xml
@@ -19,21 +19,21 @@
<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
<property name="converters">
<set>
- <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" />
- <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
- <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
- <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
- <bean class="net.shibboleth.ext.spring.config.FunctionToFunctionConverter" />
- <bean class="net.shibboleth.ext.spring.config.PredicateToPredicateConverter" />
- <bean class="net.shibboleth.ext.spring.config.StringToDurationConverter" />
- <bean class="net.shibboleth.ext.spring.config.StringToPeriodConverter" />
+ <bean class="net.shibboleth.shared.spring.config.StringToIPRangeConverter" />
+ <bean class="net.shibboleth.shared.spring.config.BooleanToPredicateConverter" />
+ <bean class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter" />
+ <bean class="net.shibboleth.shared.spring.config.StringToResourceConverter" />
+ <bean class="net.shibboleth.shared.spring.config.FunctionToFunctionConverter" />
+ <bean class="net.shibboleth.shared.spring.config.PredicateToPredicateConverter" />
+ <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" />
+ <bean class="net.shibboleth.shared.spring.config.StringToPeriodConverter" />
</set>
</property>
</bean>
<!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
<bean id="shibboleth.IdentifiableBeanPostProcessor"
- class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+ class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
<bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
@@ -80,7 +80,7 @@
<alias name="%{sp.xml.parserPool:shibboleth.DefaultParserPool}" alias="shibboleth.ParserPool"/>
- <bean id="shibboleth.DefaultParserPool" class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ <bean id="shibboleth.DefaultParserPool" class="net.shibboleth.shared.xml.impl.BasicParserPool"
depends-on="shibboleth.LoggingService" lazy-init="true"
p:maxPoolSize="100"
p:coalescing="true"
@@ -107,10 +107,10 @@
<bean id="shibboleth.SchemaBuilder" lazy-init="true"
class="org.opensaml.saml.common.xml.SAMLSchemaBuilder" c:ver="SAML_11" c:strict="%{sp.schemaValidation.strict:false}">
<property name="schemaBuilder">
- <bean class="net.shibboleth.utilities.java.support.xml.SchemaBuilder"
+ <bean class="net.shibboleth.shared.xml.SchemaBuilder"
p:schemaResources="#{getObject('shibboleth.ExtensionSchemas') ?: getObject('shibboleth.DefaultExtensionSchemas')}">
<property name="resourceResolver">
- <bean class="net.shibboleth.utilities.java.support.xml.ClasspathResolver" />
+ <bean class="net.shibboleth.shared.xml.ClasspathResolver" />
</property>
</bean>
</property>
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/http-client.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/http-client.xml
index 03aab3c..971227b 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/http-client.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/http-client.xml
@@ -18,11 +18,11 @@
<!-- These are parent beans for custom HTTP clients and resources. -->
<bean id="shibboleth.HttpClientFactory" abstract="true"
- class="net.shibboleth.ext.spring.factory.HttpClientFactoryBean" />
+ class="net.shibboleth.shared.spring.httpclient.factory.HttpClientFactoryBean" />
<bean id="shibboleth.FileCachingHttpClientFactory" abstract="true"
- class="net.shibboleth.ext.spring.factory.FileCachingHttpClientFactoryBean" />
+ class="net.shibboleth.shared.spring.httpclient.factory.FileCachingHttpClientFactoryBean" />
<bean id="shibboleth.MemoryCachingHttpClientFactory" abstract="true"
- class="net.shibboleth.ext.spring.factory.InMemoryCachingHttpClientFactoryBean" />
+ class="net.shibboleth.shared.spring.httpclient.factory.InMemoryCachingHttpClientFactoryBean" />
<!-- <bean id="shibboleth.HTTPResource" abstract="true" -->
<!-- class="net.shibboleth.idp.profile.spring.resource.impl.HTTPResourceFactoryBean" /> -->
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/integration.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/integration.xml
index f117714..7b4a656 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/integration.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/integration.xml
@@ -18,8 +18,8 @@
<bean id="integrationConversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
<property name="converters">
<set>
- <bean class="net.shibboleth.ext.spring.config.ByteArrayToDDFConverter" />
- <bean class="net.shibboleth.ext.spring.config.DDFToByteArrayConverter" />
+ <bean class="net.shibboleth.shared.spring.config.ByteArrayToDDFConverter" />
+ <bean class="net.shibboleth.shared.spring.config.DDFToByteArrayConverter" />
</set>
</property>
</bean>
@@ -70,7 +70,7 @@
<bean class="%{sp.service.integration.errorTransformerClass:net.shibboleth.sp.remoting.impl.ErrorTransformer}" />
</int:transformer>
- <int:channel id="shibboleth.InputServerChannel" datatype="net.shibboleth.utilities.java.support.ddf.DDF" />
+ <int:channel id="shibboleth.InputServerChannel" datatype="net.shibboleth.sp.ddf.DDF" />
<int:channel id="shibboleth.OutputServerChannel" datatype="byte[]" />
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/primitives.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/primitives.xml
index a0b8760..51159bc 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/primitives.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/primitives.xml
@@ -14,7 +14,7 @@
<!-- Low-level helpers. -->
- <bean id="shibboleth.Pair" class="net.shibboleth.utilities.java.support.collection.Pair" abstract="true" />
+ <bean id="shibboleth.Pair" class="net.shibboleth.shared.collection.Pair" abstract="true" />
<bean id="shibboleth.CommaDelimStringArray"
class="org.springframework.util.StringUtils" factory-method="commaDelimitedListToStringArray" abstract="true" />
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/sealer.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/sealer.xml
index 73b12d9..1ce64e2 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/sealer.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/sealer.xml
@@ -15,7 +15,7 @@
<!-- Isolated for potential reusability. -->
<bean id="shibboleth.DataSealerKeyStrategy" lazy-init="true"
- class="net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy"
+ class="net.shibboleth.shared.security.impl.BasicKeystoreKeyStrategy"
p:keystoreType="%{sp.sealer.storeType:JCEKS}"
p:keystoreResource="%{sp.sealer.storeResource:}"
p:keyVersionResource="%{sp.sealer.versionResource:}"
@@ -25,7 +25,7 @@
p:updateInterval="%{sp.sealer.updateInterval:PT15M}" />
<bean id="shibboleth.DataSealer" lazy-init="true"
- class="net.shibboleth.utilities.java.support.security.DataSealer"
+ class="net.shibboleth.shared.security.DataSealer"
p:keyStrategy-ref="#{ '%{sp.sealer.keyStrategy:shibboleth.DataSealerKeyStrategy}'.trim() }"
p:lockedAtStartup="#{!environment.containsProperty('sp.sealer.keyStrategy') and (!environment.containsProperty('sp.sealer.storePassword') or !environment.containsProperty('sp.sealer.keyPassword')) }" />
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml
index dd8bd86..d248c05 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml
@@ -15,7 +15,7 @@
<!-- Parent beans for defining services. -->
<bean id="shibboleth.ReloadableService" abstract="true"
- class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ class="net.shibboleth.shared.spring.service.ReloadableSpringService"
p:failFast="%{sp.service.failFast:false}"
p:reloadCheckDelay="PT0S"
p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
@@ -41,7 +41,7 @@
p:reloadCheckDelay="%{sp.service.provider.checkInterval:PT0S}" />
<!-- Auto-append system config file to resource set. -->
- <bean id ="ExtendedServiceProviderResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+ <bean id ="ExtendedServiceProviderResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
p:firstList="#{getObject('%{sp.service.provider.resources:shibboleth.ServiceProviderResources}'.trim())}" >
<property name="secondList">
<util:list >
diff --git a/sp-conf/pom.xml b/sp-conf/pom.xml
index 9ffe1e9..5639322 100644
--- a/sp-conf/pom.xml
+++ b/sp-conf/pom.xml
@@ -35,9 +35,8 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- <version>${spring-extensions.version}</version>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-spring</artifactId>
<scope>runtime</scope>
</dependency>
diff --git a/sp-server-api/pom.xml b/sp-server-api/pom.xml
index be5dc5f..07d2442 100644
--- a/sp-server-api/pom.xml
+++ b/sp-server-api/pom.xml
@@ -20,7 +20,34 @@
</properties>
<dependencies>
- <!-- compile dependencies -->
+ <!-- Compile dependencies -->
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-attribute-resolver-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-attribute-filter-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-metadata-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-service</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-support</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-beans</artifactId>
@@ -32,7 +59,7 @@
<scope>compile</scope>
</dependency>
- <!-- provided dependencies -->
+ <!-- Provided dependencies -->
<dependency>
<groupId>${slf4j.groupId}</groupId>
<artifactId>jcl-over-slf4j</artifactId>
@@ -43,6 +70,7 @@
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
+
<!-- Test Dependencies -->
<dependency>
<groupId>${spring.groupId}</groupId>
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/Application.java b/sp-server-api/src/main/java/net/shibboleth/sp/Application.java
index d924d47..92cd1c0 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/Application.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/Application.java
@@ -18,10 +18,15 @@ package net.shibboleth.sp;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
+import org.opensaml.saml.metadata.resolver.MetadataResolver;
+
+import net.shibboleth.idp.attribute.filter.AttributeFilter;
+import net.shibboleth.idp.attribute.resolver.AttributeResolver;
+import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.component.IdentifiedComponent;
+import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.sp.remoting.Endpoint;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
/**
* A collection of resources protected by the SP and treated as a unit for the purposes of
@@ -46,27 +51,27 @@ public interface Application extends IdentifiedComponent, Endpoint {
*
* @return the metadata source to use
*/
- @Nonnull ReloadableService<Object> getMetadataResolver();
+ @Nonnull ReloadableService<MetadataResolver> getMetadataResolver();
/**
* Get {@link AttributeTranscoderRegistry} for this {@link Application}.
*
* @return the attribute filter to use
*/
- @Nonnull ReloadableService<Object> getAttributeTranscoderRegistry();
+ @Nonnull ReloadableService<AttributeTranscoderRegistry> getAttributeTranscoderRegistry();
/**
* Get {@link AttributeResolver} for this {@link Application}.
*
* @return the attribute resolver to use
*/
- @Nonnull ReloadableService<Object> getAttributeResolver();
+ @Nonnull ReloadableService<AttributeResolver> getAttributeResolver();
/**
* Get {@link AttributeFilter} for this {@link Application}.
*
* @return the attribute filter to use
*/
- @Nonnull ReloadableService<Object> getAttributeFilter();
+ @Nonnull ReloadableService<AttributeFilter> getAttributeFilter();
}
\ No newline at end of file
diff --git a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/ByteArrayToDDFConverter.java b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/ByteArrayToDDFConverter.java
similarity index 96%
rename from sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/ByteArrayToDDFConverter.java
rename to sp-server-api/src/main/java/net/shibboleth/sp/ddf/ByteArrayToDDFConverter.java
index 22c31e1..951a6b6 100644
--- a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/ByteArrayToDDFConverter.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/ByteArrayToDDFConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.ddf;
+package net.shibboleth.sp.ddf;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/DDF.java b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/DDF.java
similarity index 99%
rename from sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/DDF.java
rename to sp-server-api/src/main/java/net/shibboleth/sp/ddf/DDF.java
index 29273e7..c106a62 100644
--- a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/DDF.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/DDF.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.ddf;
+package net.shibboleth.sp.ddf;
import java.io.IOException;
import java.io.InputStream;
@@ -33,11 +33,12 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.NotThreadSafe;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotLive;
+import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.logic.Constraint;
+
/**
* The core object in the DDF mode, this is a node in a tree of objects that
diff --git a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/DDFSupport.java b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/DDFSupport.java
similarity index 93%
rename from sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/DDFSupport.java
rename to sp-server-api/src/main/java/net/shibboleth/sp/ddf/DDFSupport.java
index 72ddffe..08add64 100644
--- a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/DDFSupport.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/DDFSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.ddf;
+package net.shibboleth.sp.ddf;
import javax.annotation.Nonnull;
@@ -23,9 +23,9 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.xml.ElementSupport;
/**
* Helper methods for {@link DDF} usage.
diff --git a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/DDFToByteArrayConverter.java b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/DDFToByteArrayConverter.java
similarity index 96%
rename from sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/DDFToByteArrayConverter.java
rename to sp-server-api/src/main/java/net/shibboleth/sp/ddf/DDFToByteArrayConverter.java
index c2adc0e..4653e71 100644
--- a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/DDFToByteArrayConverter.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/DDFToByteArrayConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.ddf;
+package net.shibboleth.sp.ddf;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletRequest.java b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/RemotedHttpServletRequest.java
similarity index 98%
rename from sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletRequest.java
rename to sp-server-api/src/main/java/net/shibboleth/sp/ddf/RemotedHttpServletRequest.java
index bf0a04e..4daa0ca 100644
--- a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletRequest.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/RemotedHttpServletRequest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.ddf;
+package net.shibboleth.sp.ddf;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -59,14 +59,14 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.collection.Pair;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.net.URISupport;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.net.URISupport;
/**
* Wraps a {@link DDF} object reflecting a remoted message encapsulating an HTTP request.
diff --git a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletResponse.java b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/RemotedHttpServletResponse.java
similarity index 98%
rename from sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletResponse.java
rename to sp-server-api/src/main/java/net/shibboleth/sp/ddf/RemotedHttpServletResponse.java
index b9ff05b..d960f41 100644
--- a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletResponse.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/RemotedHttpServletResponse.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.ddf;
+package net.shibboleth.sp.ddf;
import java.io.IOException;
import java.io.PrintWriter;
@@ -37,10 +37,10 @@ import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.WriteListener;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Uses a {@link DDF} object to reflect an HTTP response back to a remote caller.
diff --git a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/package-info.java b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/package-info.java
similarity index 96%
rename from sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/package-info.java
rename to sp-server-api/src/main/java/net/shibboleth/sp/ddf/package-info.java
index 2cf59d4..28ca885 100644
--- a/sp-server-api/src/main/java/net/shibboleth/utilities/java/support/ddf/package-info.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/ddf/package-info.java
@@ -25,4 +25,4 @@
* compilation of client/server stubs.</p>
*/
-package net.shibboleth.utilities.java.support.ddf;
\ No newline at end of file
+package net.shibboleth.sp.ddf;
\ No newline at end of file
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/remoting/AbstractEndpoint.java b/sp-server-api/src/main/java/net/shibboleth/sp/remoting/AbstractEndpoint.java
index 25443a3..6e87582 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/remoting/AbstractEndpoint.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/remoting/AbstractEndpoint.java
@@ -17,10 +17,9 @@ package net.shibboleth.sp.remoting;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.ddf.DDF;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.sp.ddf.DDF;
/**
* Simple {@link Endpoint} implementation.
@@ -29,7 +28,7 @@ public abstract class AbstractEndpoint extends AbstractIdentifiableInitializable
/** {@inheritDoc} */
@Nonnull public DDF receive(@Nonnull final DDF input) throws RemoteProcessingException {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ checkComponentActive();
Constraint.isTrue(getAddress().equals(input.name()), "Address was invalid");
return doReceive(input);
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/remoting/ApplicationEndpoint.java b/sp-server-api/src/main/java/net/shibboleth/sp/remoting/ApplicationEndpoint.java
index b60b91f..fe141ed 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/remoting/ApplicationEndpoint.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/remoting/ApplicationEndpoint.java
@@ -17,9 +17,9 @@ package net.shibboleth.sp.remoting;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.sp.Application;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.ddf.DDF;
+import net.shibboleth.sp.ddf.DDF;
/**
* Objects implement this interface to receive messages from SP agents scoped by specific
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/remoting/ApplicationEndpointManager.java b/sp-server-api/src/main/java/net/shibboleth/sp/remoting/ApplicationEndpointManager.java
index 9adc4bd..0de53a3 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/remoting/ApplicationEndpointManager.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/remoting/ApplicationEndpointManager.java
@@ -18,11 +18,12 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.DestructableComponent;
-import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
-import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.component.DestructableComponent;
+import net.shibboleth.shared.component.IdentifiedComponent;
+import net.shibboleth.shared.component.InitializableComponent;
+import net.shibboleth.shared.component.UnmodifiableComponent;
+
/**
* Handles message dispatch to {@link ApplicationEndpoint} objects that implement
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/remoting/Endpoint.java b/sp-server-api/src/main/java/net/shibboleth/sp/remoting/Endpoint.java
index 710554a..02ef52e 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/remoting/Endpoint.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/remoting/Endpoint.java
@@ -17,8 +17,8 @@ package net.shibboleth.sp.remoting;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.ddf.DDF;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.sp.ddf.DDF;
/**
* Objects implement this interface to receive messages from SP agents and to support
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/remoting/EndpointManager.java b/sp-server-api/src/main/java/net/shibboleth/sp/remoting/EndpointManager.java
index 6e91ac4..f3e88bd 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/remoting/EndpointManager.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/remoting/EndpointManager.java
@@ -18,11 +18,12 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.DestructableComponent;
-import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
-import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.component.DestructableComponent;
+import net.shibboleth.shared.component.IdentifiedComponent;
+import net.shibboleth.shared.component.InitializableComponent;
+import net.shibboleth.shared.component.UnmodifiableComponent;
+
/**
* Handles message dispatch to {@link Endpoint} objects that implement actual business logic.
diff --git a/sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/DDFSupportTest.java b/sp-server-api/src/test/java/net/shibboleth/sp/ddf/DDFSupportTest.java
similarity index 90%
rename from sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/DDFSupportTest.java
rename to sp-server-api/src/test/java/net/shibboleth/sp/ddf/DDFSupportTest.java
index 382b09b..f6dfca9 100644
--- a/sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/DDFSupportTest.java
+++ b/sp-server-api/src/test/java/net/shibboleth/sp/ddf/DDFSupportTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.ddf;
+package net.shibboleth.sp.ddf;
import java.io.IOException;
import java.util.List;
@@ -25,18 +25,17 @@ import javax.annotation.Nullable;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Ignore;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.xml.BasicParserPool;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.xml.XMLParserException;
+import net.shibboleth.shared.xml.impl.BasicParserPool;
+
/**
* Unit test for {@link DDFSupport}.
*/
- at Ignore
public class DDFSupportTest {
@Nullable private BasicParserPool parserPool;
diff --git a/sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/DDFTest.java b/sp-server-api/src/test/java/net/shibboleth/sp/ddf/DDFTest.java
similarity index 99%
rename from sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/DDFTest.java
rename to sp-server-api/src/test/java/net/shibboleth/sp/ddf/DDFTest.java
index 086697f..923024f 100644
--- a/sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/DDFTest.java
+++ b/sp-server-api/src/test/java/net/shibboleth/sp/ddf/DDFTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.ddf;
+package net.shibboleth.sp.ddf;
import static org.testng.Assert.*;
@@ -27,15 +27,14 @@ import java.io.UnsupportedEncodingException;
import javax.annotation.Nonnull;
-import org.testng.annotations.Ignore;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.Pair;
+
/**
* DDF unit tests.
*/
- at Ignore
public class DDFTest {
@Test
diff --git a/sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletRequestTest.java b/sp-server-api/src/test/java/net/shibboleth/sp/ddf/RemotedHttpServletRequestTest.java
similarity index 98%
rename from sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletRequestTest.java
rename to sp-server-api/src/test/java/net/shibboleth/sp/ddf/RemotedHttpServletRequestTest.java
index 255d8d2..8bf34ff 100644
--- a/sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletRequestTest.java
+++ b/sp-server-api/src/test/java/net/shibboleth/sp/ddf/RemotedHttpServletRequestTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.ddf;
+package net.shibboleth.sp.ddf;
import static org.testng.Assert.*;
@@ -25,14 +25,12 @@ import java.util.List;
import jakarta.servlet.http.Cookie;
import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Ignore;
import org.testng.annotations.Test;
import org.testng.reporters.Files;
/**
* Unit test for {@link RemotedHttpServletRequest}.
*/
- at Ignore
public class RemotedHttpServletRequestTest {
private DDF obj;
diff --git a/sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletResponseTest.java b/sp-server-api/src/test/java/net/shibboleth/sp/ddf/RemotedHttpServletResponseTest.java
similarity index 98%
rename from sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletResponseTest.java
rename to sp-server-api/src/test/java/net/shibboleth/sp/ddf/RemotedHttpServletResponseTest.java
index 5853dac..4de6dcb 100644
--- a/sp-server-api/src/test/java/net/shibboleth/utilities/java/support/ddf/RemotedHttpServletResponseTest.java
+++ b/sp-server-api/src/test/java/net/shibboleth/sp/ddf/RemotedHttpServletResponseTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.ddf;
+package net.shibboleth.sp.ddf;
import static org.testng.Assert.*;
@@ -28,13 +28,11 @@ import java.util.Set;
import jakarta.servlet.http.Cookie;
import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Ignore;
import org.testng.annotations.Test;
/**
* Unit test for {@link RemotedHttpServletResponse}.
*/
- at Ignore
public class RemotedHttpServletResponseTest {
private DDF obj;
diff --git a/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/empty-name.ddf b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/empty-name.ddf
new file mode 100644
index 0000000..b40aabf
--- /dev/null
+++ b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/empty-name.ddf
@@ -0,0 +1 @@
+foo%20bar 0
diff --git a/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/empty-noname.ddf b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/empty-noname.ddf
new file mode 100644
index 0000000..fa85f21
--- /dev/null
+++ b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/empty-noname.ddf
@@ -0,0 +1 @@
+. 0
diff --git a/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/float-name.ddf b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/float-name.ddf
new file mode 100644
index 0000000..90b9d2b
--- /dev/null
+++ b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/float-name.ddf
@@ -0,0 +1 @@
+foo%20bar 3 42.1315927
diff --git a/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/int-name.ddf b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/int-name.ddf
new file mode 100644
index 0000000..24993a2
--- /dev/null
+++ b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/int-name.ddf
@@ -0,0 +1 @@
+foo%20bar 2 42
diff --git a/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/long-name.ddf b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/long-name.ddf
new file mode 100644
index 0000000..f1c355e
--- /dev/null
+++ b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/long-name.ddf
@@ -0,0 +1 @@
+foo%20bar 8 42000000000
diff --git a/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/string-name.ddf b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/string-name.ddf
new file mode 100644
index 0000000..03f5470
--- /dev/null
+++ b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/string-name.ddf
@@ -0,0 +1 @@
+foo%20bar 1 zorkmid%E2%98%AF%EF%B8%8F
diff --git a/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/struct-complex.ddf b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/struct-complex.ddf
new file mode 100644
index 0000000..a873e57
--- /dev/null
+++ b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/struct-complex.ddf
@@ -0,0 +1,6 @@
+foo%20bar 4 1
+infocom 4 1
+zork 5 3
+. 2 1
+. 2 2
+. 2 3
diff --git a/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/struct-empty.ddf b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/struct-empty.ddf
new file mode 100644
index 0000000..1c8f211
--- /dev/null
+++ b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/struct-empty.ddf
@@ -0,0 +1 @@
+foo%20bar 4 0
diff --git a/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/unsafestring-name.ddf b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/unsafestring-name.ddf
new file mode 100644
index 0000000..02eccdc
--- /dev/null
+++ b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/unsafestring-name.ddf
@@ -0,0 +1 @@
+foo%20bar 7 foo%80bar
diff --git a/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/zork.xml b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/zork.xml
new file mode 100644
index 0000000..fd4ac93
--- /dev/null
+++ b/sp-server-api/src/test/resources/net/shibboleth/sp/ddf/zork.xml
@@ -0,0 +1,5 @@
+<root foo="bar">
+ <zork zorkmids="10" underground="true" />
+
+ <frobnitz>grue</frobnitz>
+</root>
\ No newline at end of file
diff --git a/sp-server-impl/pom.xml b/sp-server-impl/pom.xml
index ee0df5f..23f6a31 100644
--- a/sp-server-impl/pom.xml
+++ b/sp-server-impl/pom.xml
@@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java
index 3e5a1fd..ecfdb47 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java
@@ -20,17 +20,17 @@ import javax.annotation.Nonnull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentSupport;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.sp.Application;
import net.shibboleth.sp.remoting.AbstractEndpoint;
import net.shibboleth.sp.remoting.ApplicationEndpoint;
import net.shibboleth.sp.remoting.ApplicationEndpointManager;
import net.shibboleth.sp.remoting.RemoteProcessingException;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.ddf.DDF;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.sp.ddf.DDF;
import net.shibboleth.utilities.java.support.service.ReloadableService;
/**
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/OpenSAMLConfigBean.java b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/OpenSAMLConfigBean.java
index fae5e05..57a9d16 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/OpenSAMLConfigBean.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/OpenSAMLConfigBean.java
@@ -28,10 +28,10 @@ import org.slf4j.LoggerFactory;
import com.codahale.metrics.MetricRegistry;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.xml.ParserPool;
+import net.shibboleth.shared.component.AbstractInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentSupport;
+import net.shibboleth.shared.xml.ParserPool;
/**
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/Echo.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/Echo.java
index 230735a..306951d 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/Echo.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/Echo.java
@@ -19,9 +19,9 @@ import net.shibboleth.sp.remoting.RemoteProcessingException;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.sp.remoting.AbstractEndpoint;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.ddf.DDF;
+import net.shibboleth.sp.ddf.DDF;
/**
* Echo service endpoint.
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/Ping.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/Ping.java
index 4321b7b..efc3ed9 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/Ping.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/Ping.java
@@ -19,9 +19,9 @@ import net.shibboleth.sp.remoting.RemoteProcessingException;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.sp.remoting.AbstractEndpoint;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.ddf.DDF;
+import net.shibboleth.sp.ddf.DDF;
/**
* Ping service endpoint.
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParser.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParser.java
index faae3e2..bfcb101 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParser.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParser.java
@@ -27,16 +27,16 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentSupport;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.xml.ParserPool;
+import net.shibboleth.shared.xml.XMLParserException;
import net.shibboleth.sp.remoting.AbstractEndpoint;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.ddf.DDF;
-import net.shibboleth.utilities.java.support.ddf.DDFSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.xml.ParserPool;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import net.shibboleth.sp.ddf.DDF;
+import net.shibboleth.sp.ddf.DDFSupport;
/**
* Parses XML into a DDF for agent consumption.
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicApplicationEndpointManager.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicApplicationEndpointManager.java
index b193a05..c5b3131 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicApplicationEndpointManager.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicApplicationEndpointManager.java
@@ -26,11 +26,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.sp.remoting.ApplicationEndpoint;
import net.shibboleth.sp.remoting.ApplicationEndpointManager;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
/**
* Simple implementation of {@link ApplicationEndpointManager} that relies on an in-memory map
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicEndpointManager.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicEndpointManager.java
index 930e08d..f3fb145 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicEndpointManager.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicEndpointManager.java
@@ -26,11 +26,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.sp.remoting.Endpoint;
import net.shibboleth.sp.remoting.EndpointManager;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
/**
* Simple implementation of {@link EndpointManager} that relies on an in-memory map
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/ErrorTransformer.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/ErrorTransformer.java
index fb2487b..607c35a 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/ErrorTransformer.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/ErrorTransformer.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.springframework.integration.transformer.AbstractPayloadTransformer;
import net.shibboleth.sp.remoting.RemoteProcessingException;
-import net.shibboleth.utilities.java.support.ddf.DDF;
+import net.shibboleth.sp.ddf.DDF;
/**
* Spring Integration message transformer that turns exceptions into data for the
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/ReloadingEndpointManager.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/ReloadingEndpointManager.java
index 4592d25..8bbc1c3 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/ReloadingEndpointManager.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/ReloadingEndpointManager.java
@@ -20,12 +20,12 @@ package net.shibboleth.sp.remoting.impl;
import javax.annotation.Nonnull;
import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.sp.remoting.Endpoint;
import net.shibboleth.sp.remoting.EndpointManager;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* This class wraps an {@link EndpointManager} in a
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/RequestProcessor.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/RequestProcessor.java
index 4bc7b68..26e84bf 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/RequestProcessor.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/RequestProcessor.java
@@ -29,16 +29,16 @@ import org.springframework.integration.ip.IpHeaders;
import org.springframework.messaging.Message;
import net.shibboleth.sp.remoting.RemoteProcessingException;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentSupport;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.net.IPRange;
import net.shibboleth.sp.remoting.Endpoint;
import net.shibboleth.sp.remoting.EndpointManager;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.ddf.DDF;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.net.IPRange;
+import net.shibboleth.sp.ddf.DDF;
import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/tcp/impl/TCPConnectionInterceptorFactory.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/tcp/impl/TCPConnectionInterceptorFactory.java
index 65e737c..0fc6190 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/tcp/impl/TCPConnectionInterceptorFactory.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/tcp/impl/TCPConnectionInterceptorFactory.java
@@ -31,9 +31,9 @@ import org.springframework.integration.ip.tcp.connection.TcpConnectionIntercepto
import org.springframework.messaging.Message;
import org.springframework.messaging.MessagingException;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.net.IPRange;
import net.shibboleth.sp.remoting.RemoteProcessingException;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.net.IPRange;
/**
* Interceptor that adds security to connections.
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/spring/impl/PropertiesApplicationContextInitializer.java b/sp-server-impl/src/main/java/net/shibboleth/sp/spring/impl/PropertiesApplicationContextInitializer.java
index bbe3cfd..9d19bb1 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/spring/impl/PropertiesApplicationContextInitializer.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/spring/impl/PropertiesApplicationContextInitializer.java
@@ -19,7 +19,7 @@ import javax.annotation.Nonnull;
import org.springframework.context.ConfigurableApplicationContext;
import net.shibboleth.ext.spring.context.AbstractPropertiesApplicationContextInitializer;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
* Specialization of context initializer for SP use.
diff --git a/sp-server-impl/src/test/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParserTest.java b/sp-server-impl/src/test/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParserTest.java
index b73d5e3..d0a30dd 100644
--- a/sp-server-impl/src/test/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParserTest.java
+++ b/sp-server-impl/src/test/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParserTest.java
@@ -27,11 +27,11 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.xml.XMLParserException;
+import net.shibboleth.shared.xml.impl.BasicParserPool;
import net.shibboleth.sp.remoting.RemoteProcessingException;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.ddf.DDF;
-import net.shibboleth.utilities.java.support.xml.BasicParserPool;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import net.shibboleth.sp.ddf.DDF;
/**
* Unit test for {@link XMLParser}.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list