[java-shib-shared] branch main updated: Relocate security factory beans to eliminate optional dependency.
Scott Cantor
cantor.2 at osu.edu
Tue Sep 13 15:10:02 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-shared.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=829f74e2662dc6bb8a5295175659e941f3cd42bf
The following commit(s) were added to refs/heads/main by this push:
new 829f74e2 Relocate security factory beans to eliminate optional dependency.
829f74e2 is described below
commit 829f74e2662dc6bb8a5295175659e941f3cd42bf
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 13 11:09:59 2022 -0400
Relocate security factory beans to eliminate optional dependency.
---
pom.xml | 1 +
shib-security-spring/.check-m2 | 1 +
shib-security-spring/.checkstyle | 15 +++++
shib-security-spring/.gitignore | 21 +++++++
shib-security-spring/pom.xml | 73 ++++++++++++++++++++++
.../factory/PKCS11PrivateKeyFactoryBean.java | 2 +-
.../security}/factory/PrivateKeyFactoryBean.java | 2 +-
.../security}/factory/PublicKeyFactoryBean.java | 2 +-
.../factory/X509CertificateChainFactoryBean.java | 2 +-
.../factory/X509CertificateFactoryBean.java | 2 +-
.../spring/security/factory/package-info.java | 26 ++------
.../factory/PKCS11PrivateKeyFactoryBeanTest.java | 4 +-
.../factory/PrivateKeyFactoryBeanTest.java | 2 +-
.../factory/PublicKeyFactoryBeanTest.java | 2 +-
.../X509CertificateChainFactoryBeanTest.java | 2 +-
.../factory/X509CertificateFactoryBeanTest.java | 2 +-
.../PKCS11PrivateKeyFactoryBean-softhsm.cfg | 0
.../factory/PrivateKeyFactoryBean-config.xml | 4 +-
.../factory/PrivateKeyFactoryBean-key.pem | 0
.../factory/PublicKeyFactoryBean-config.xml | 4 +-
.../security}/factory/PublicKeyFactoryBean-key.pem | 0
.../X509CertificateChainFactoryBean-bundle.pem | 0
.../X509CertificateChainFactoryBean-config.xml | 4 +-
.../factory/X509CertificateFactoryBean-cert.pem | 0
.../factory/X509CertificateFactoryBean-config.xml | 4 +-
shib-shared-bom/pom.xml | 5 ++
shib-spring/pom.xml | 6 --
27 files changed, 139 insertions(+), 47 deletions(-)
diff --git a/pom.xml b/pom.xml
index f7c8269a..d97b439e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
<module>shib-spring</module>
<module>shib-networking</module>
<module>shib-security</module>
+ <module>shib-security-spring</module>
<module>shib-service</module>
<module>shib-testing</module>
<module>shib-velocity</module>
diff --git a/shib-security-spring/.check-m2 b/shib-security-spring/.check-m2
new file mode 100644
index 00000000..048849a0
--- /dev/null
+++ b/shib-security-spring/.check-m2
@@ -0,0 +1 @@
+This file provokes a signature check of the maven repository unless overridden by the no-check-m2 property.
\ No newline at end of file
diff --git a/shib-security-spring/.checkstyle b/shib-security-spring/.checkstyle
new file mode 100644
index 00000000..186d7f35
--- /dev/null
+++ b/shib-security-spring/.checkstyle
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+
+ <local-check-config name="Shibboleth Checkstyle" location="/java-shib-shared/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
+
+</fileset-config>
diff --git a/shib-security-spring/.gitignore b/shib-security-spring/.gitignore
new file mode 100644
index 00000000..d8e6f876
--- /dev/null
+++ b/shib-security-spring/.gitignore
@@ -0,0 +1,21 @@
+# A simulation of Subversion default ignores, generated by reposurgeon.
+*.o
+*.lo
+*.la
+*.al
+*.libs
+*.so
+*.so.[0-9]*
+*.a
+*.pyc
+*.pyo
+*.rej
+*.iml
+*~
+*.#*
+.*.swp
+.DS_store
+# Simulated Subversion default ignores end here
+# The contents of the svn:ignore property on the branch root.
+/test-output
+/target
diff --git a/shib-security-spring/pom.xml b/shib-security-spring/pom.xml
new file mode 100644
index 00000000..0ac13932
--- /dev/null
+++ b/shib-security-spring/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-shared-parent</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ </parent>
+
+ <name>Shibboleth Shared :: Security Spring Support</name>
+ <artifactId>shib-security-spring</artifactId>
+ <packaging>jar</packaging>
+
+ <properties>
+ <automatic.module.name>net.shibboleth.shared.spring.security</automatic.module.name>
+ <checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
+ </properties>
+
+ <dependencies>
+ <!-- Compile Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.cryptacular</groupId>
+ <artifactId>cryptacular</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+
+ <!-- Provided dependencies -->
+
+ <!-- Runtime Dependencies -->
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>${shibboleth.scm.connection}java-shib-shared</connection>
+ <developerConnection>${shibboleth.scm.developerConnection}java-shib-shared</developerConnection>
+ <url>${shibboleth.scm.url}java-shib-shared.git</url>
+ </scm>
+
+ <distributionManagement>
+ <site>
+ <id>site</id>
+ <url>scp:${shared-module.site.url}</url>
+ </site>
+ </distributionManagement>
+
+</project>
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PKCS11PrivateKeyFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBean.java
similarity index 99%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PKCS11PrivateKeyFactoryBean.java
rename to shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBean.java
index 24305549..77defed6 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PKCS11PrivateKeyFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.security.factory;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
rename to shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean.java
index 872a9e09..631bc501 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.security.factory;
import java.io.InputStream;
import java.security.PrivateKey;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean.java
similarity index 97%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
rename to shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean.java
index 64a4c981..2c53784a 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.security.factory;
import java.io.InputStream;
import java.security.PublicKey;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean.java
similarity index 97%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java
rename to shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean.java
index 2ea27a94..08b2b7a3 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.security.factory;
import java.io.InputStream;
import java.security.cert.X509Certificate;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean.java
similarity index 97%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean.java
rename to shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean.java
index cbe33862..e4a1dd02 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.security.factory;
import java.io.InputStream;
import java.security.cert.X509Certificate;
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBeanTest.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/package-info.java
similarity index 53%
copy from shib-spring/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBeanTest.java
copy to shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/package-info.java
index e3f2c832..09f535fd 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBeanTest.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/package-info.java
@@ -15,25 +15,7 @@
* limitations under the License.
*/
-
-package net.shibboleth.ext.spring.factory;
-
-import java.security.cert.X509Certificate;
-
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
- at ContextConfiguration({"X509CertificateChainFactoryBean-config.xml"})
- at SuppressWarnings("javadoc")
-public class X509CertificateChainFactoryBeanTest extends AbstractTestNGSpringContextTests {
-
- @Test public void testFactory() {
- final Object bean = applicationContext.getBean("chain");
- Assert.assertNotNull(bean);
- final X509Certificate[] chain = (X509Certificate[])bean;
- Assert.assertTrue(chain.length == 3);
- }
-
-}
+/**
+ * Factory beans for security classes.
+ */
+package net.shibboleth.shared.spring.security.factory;
\ No newline at end of file
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/PKCS11PrivateKeyFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBeanTest.java
similarity index 91%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/factory/PKCS11PrivateKeyFactoryBeanTest.java
rename to shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBeanTest.java
index 6a1ba93e..679a44e7 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/PKCS11PrivateKeyFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBeanTest.java
@@ -1,5 +1,5 @@
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.security.factory;
import java.security.Security;
@@ -49,7 +49,7 @@ public class PKCS11PrivateKeyFactoryBeanTest {
public void testSoftHSM() throws Exception {
// Locate the configuration file
final var configResource =
- this.getClass().getResource("/net/shibboleth/ext/spring/factory/PKCS11PrivateKeyFactoryBean-softhsm.cfg");
+ this.getClass().getResource("/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBean-softhsm.cfg");
final var configFile = configResource.getFile();
// Wire up the factory bean
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBeanTest.java
similarity index 96%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBeanTest.java
rename to shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBeanTest.java
index 83958558..59c54d2f 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBeanTest.java
@@ -16,7 +16,7 @@
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.security.factory;
import java.security.interfaces.RSAPrivateKey;
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBeanTest.java
similarity index 96%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBeanTest.java
rename to shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBeanTest.java
index 649f5bf0..8dc820a5 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBeanTest.java
@@ -16,7 +16,7 @@
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.security.factory;
import java.security.interfaces.RSAPublicKey;
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBeanTest.java
similarity index 96%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBeanTest.java
rename to shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBeanTest.java
index e3f2c832..ccd55567 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBeanTest.java
@@ -16,7 +16,7 @@
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.security.factory;
import java.security.cert.X509Certificate;
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBeanTest.java
similarity index 97%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBeanTest.java
rename to shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBeanTest.java
index 9d85c374..baadfe3b 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBeanTest.java
@@ -16,7 +16,7 @@
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.security.factory;
import java.security.PublicKey;
import java.security.cert.X509Certificate;
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PKCS11PrivateKeyFactoryBean-softhsm.cfg b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBean-softhsm.cfg
similarity index 100%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PKCS11PrivateKeyFactoryBean-softhsm.cfg
rename to shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBean-softhsm.cfg
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean-config.xml b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean-config.xml
similarity index 78%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean-config.xml
rename to shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean-config.xml
index 9d5f65ea..f34a673b 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean-config.xml
+++ b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean-config.xml
@@ -9,10 +9,10 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
- <bean id="key" class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
+ <bean id="key" class="net.shibboleth.shared.spring.security.factory.PrivateKeyFactoryBean">
<property name="resource">
<bean class="org.springframework.core.io.ClassPathResource">
- <constructor-arg value="net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean-key.pem"/>
+ <constructor-arg value="net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean-key.pem"/>
</bean>
</property>
</bean>
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean-key.pem b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean-key.pem
similarity index 100%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean-key.pem
rename to shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean-key.pem
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean-config.xml b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean-config.xml
similarity index 78%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean-config.xml
rename to shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean-config.xml
index f57069a5..a4ece6da 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean-config.xml
+++ b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean-config.xml
@@ -9,10 +9,10 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
- <bean id="key" class="net.shibboleth.ext.spring.factory.PublicKeyFactoryBean">
+ <bean id="key" class="net.shibboleth.shared.spring.security.factory.PublicKeyFactoryBean">
<property name="resource">
<bean class="org.springframework.core.io.ClassPathResource">
- <constructor-arg value="net/shibboleth/ext/spring/factory/PublicKeyFactoryBean-key.pem"/>
+ <constructor-arg value="net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean-key.pem"/>
</bean>
</property>
</bean>
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean-key.pem b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean-key.pem
similarity index 100%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean-key.pem
rename to shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean-key.pem
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean-bundle.pem b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean-bundle.pem
similarity index 100%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean-bundle.pem
rename to shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean-bundle.pem
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean-config.xml b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean-config.xml
similarity index 76%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean-config.xml
rename to shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean-config.xml
index 6efedae8..bb872c37 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean-config.xml
+++ b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean-config.xml
@@ -9,10 +9,10 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
- <bean id="chain" class="net.shibboleth.ext.spring.factory.X509CertificateChainFactoryBean">
+ <bean id="chain" class="net.shibboleth.shared.spring.security.factory.X509CertificateChainFactoryBean">
<property name="resource">
<bean class="org.springframework.core.io.ClassPathResource">
- <constructor-arg value="net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean-bundle.pem"/>
+ <constructor-arg value="net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean-bundle.pem"/>
</bean>
</property>
</bean>
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean-cert.pem b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean-cert.pem
similarity index 100%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean-cert.pem
rename to shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean-cert.pem
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean-config.xml b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean-config.xml
similarity index 76%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean-config.xml
rename to shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean-config.xml
index 8e8bbe7c..2f4e1540 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean-config.xml
+++ b/shib-security-spring/src/test/resources/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean-config.xml
@@ -9,10 +9,10 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
- <bean id="certificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+ <bean id="certificate" class="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean">
<property name="resource">
<bean class="org.springframework.core.io.ClassPathResource">
- <constructor-arg value="net/shibboleth/ext/spring/factory/X509CertificateFactoryBean-cert.pem"/>
+ <constructor-arg value="net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean-cert.pem"/>
</bean>
</property>
</bean>
diff --git a/shib-shared-bom/pom.xml b/shib-shared-bom/pom.xml
index c97cff81..c7ac6b61 100644
--- a/shib-shared-bom/pom.xml
+++ b/shib-shared-bom/pom.xml
@@ -27,6 +27,11 @@
<artifactId>shib-security</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-security-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shib-service</artifactId>
diff --git a/shib-spring/pom.xml b/shib-spring/pom.xml
index cef7c703..c91bbaa2 100644
--- a/shib-spring/pom.xml
+++ b/shib-spring/pom.xml
@@ -57,12 +57,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.cryptacular</groupId>
- <artifactId>cryptacular</artifactId>
- <!-- Required for any classes that deals with cryptographic artifacts (keys, certs, algorithms, etc.) -->
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list