[java-identity-provider] branch master updated: Add an embedded DB data source for pairwise ID testing.
Scott Cantor
cantor.2 at osu.edu
Tue Feb 19 20:38:43 EST 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=e9d800d080bce35f8bb9ca5bfb145972d681dec9
The following commit(s) were added to refs/heads/master by this push:
new e9d800d Add an embedded DB data source for pairwise ID testing.
e9d800d is described below
commit e9d800d080bce35f8bb9ca5bfb145972d681dec9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 19 20:38:06 2019 -0500
Add an embedded DB data source for pairwise ID testing.
---
idp-conf/pom.xml | 5 +++++
.../resources/META-INF/net/shibboleth/idp/StoredIdStore.sql | 11 +++++++++++
idp-conf/src/test/resources/conf/global.xml | 6 ++++++
3 files changed, 22 insertions(+)
diff --git a/idp-conf/pom.xml b/idp-conf/pom.xml
index 98927cf..426ca71 100644
--- a/idp-conf/pom.xml
+++ b/idp-conf/pom.xml
@@ -147,6 +147,11 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- Managed Dependencies -->
</dependencies>
diff --git a/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/StoredIdStore.sql b/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/StoredIdStore.sql
new file mode 100644
index 0000000..294b108
--- /dev/null
+++ b/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/StoredIdStore.sql
@@ -0,0 +1,11 @@
+CREATE TABLE shibpid (
+ localEntity VARCHAR(100) NOT NULL,
+ peerEntity VARCHAR(100) NOT NULL,
+ persistentId VARCHAR(50) NOT NULL,
+ principalName VARCHAR(50) NOT NULL,
+ localId VARCHAR(50) NOT NULL,
+ peerProvidedId VARCHAR(50),
+ creationDate TIMESTAMP NOT NULL,
+ deactivationDate TIMESTAMP,
+ PRIMARY KEY (localEntity, peerEntity, persistentId)
+ );
diff --git a/idp-conf/src/test/resources/conf/global.xml b/idp-conf/src/test/resources/conf/global.xml
index 37dc0c3..4454031 100644
--- a/idp-conf/src/test/resources/conf/global.xml
+++ b/idp-conf/src/test/resources/conf/global.xml
@@ -2,11 +2,13 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:c="http://www.springframework.org/schema/c"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize"
@@ -53,4 +55,8 @@
<bean class="org.opensaml.saml.metadata.resolver.index.impl.SAMLArtifactMetadataIndex" />
</util:set>
+ <jdbc:embedded-database id="testbed.PairwiseIdDataSource" generate-name="true">
+ <jdbc:script location="classpath:/META-INF/net/shibboleth/idp/StoredIdStore.sql"/>
+ </jdbc:embedded-database>
+
</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list