From 0757642e671c59bcbdc217ff471a335d3b4826af Mon Sep 17 00:00:00 2001
From: Amanda Anganes <aanganes@mitre.org>
Date: Thu, 9 Aug 2012 09:25:49 -0400
Subject: [PATCH] removed "s" from allowed_scopes

---
 .../java/org/mitre/openid/connect/model/WhitelistedSite.java  | 3 ++-
 openid-connect-server/db/tables/allowed_scope.sql             | 4 ++++
 openid-connect-server/db/tables/allowed_scopes.sql            | 4 ----
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 openid-connect-server/db/tables/allowed_scope.sql
 delete mode 100644 openid-connect-server/db/tables/allowed_scopes.sql

diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
index 04b581669..1ac232ade 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
@@ -103,9 +103,10 @@ public class WhitelistedSite {
 	 */
 	@ElementCollection(fetch = FetchType.EAGER)
 	@CollectionTable(
-    		name="allowed_scopes",
+    		name="allowed_scope",
     		joinColumns=@JoinColumn(name="owner_id")
     )
+	@Column(name="allowed_scope")
 	public Set<String> getAllowedScopes() {
 		return allowedScopes;
 	}
diff --git a/openid-connect-server/db/tables/allowed_scope.sql b/openid-connect-server/db/tables/allowed_scope.sql
new file mode 100644
index 000000000..b17426893
--- /dev/null
+++ b/openid-connect-server/db/tables/allowed_scope.sql
@@ -0,0 +1,4 @@
+create table allowed_scope (
+	owner_id VARCHAR(256), 
+	allowed_scope VARCHAR(256)
+);
diff --git a/openid-connect-server/db/tables/allowed_scopes.sql b/openid-connect-server/db/tables/allowed_scopes.sql
deleted file mode 100644
index cdb952c32..000000000
--- a/openid-connect-server/db/tables/allowed_scopes.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-create table allowed_scopes(
-	owner_id VARCHAR(256), 
-	allowedScopes VARCHAR(256)
-);