From cd0a1170317984aa47e3cb1c4802c42240ef1516 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 4 Jan 2012 10:00:45 -0500 Subject: [PATCH 1/8] tweaked pom, refactored jwt claims --- pom.xml | 7 +- .../java/org/mitre/jwt/model/ClaimSet.java | 117 ++++++++++ .../java/org/mitre/jwt/model/JwtClaims.java | 206 ++++-------------- .../java/org/mitre/jwt/model/JwtHeader.java | 116 ++-------- 4 files changed, 184 insertions(+), 262 deletions(-) create mode 100644 src/main/java/org/mitre/jwt/model/ClaimSet.java diff --git a/pom.xml b/pom.xml index 1a02dfcaf..9b0d9b3ee 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,11 @@ org.mitre openid OpenIdConnect - war + pom 0.1 + + spring-security-oauth/spring-security-oauth2 + 1.6 3.0.6.RELEASE @@ -304,7 +307,7 @@ - pushEE + openid-connect-server true diff --git a/src/main/java/org/mitre/jwt/model/ClaimSet.java b/src/main/java/org/mitre/jwt/model/ClaimSet.java new file mode 100644 index 000000000..9107afea7 --- /dev/null +++ b/src/main/java/org/mitre/jwt/model/ClaimSet.java @@ -0,0 +1,117 @@ +package org.mitre.jwt.model; + +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; + +public class ClaimSet { + + private Map claims = new LinkedHashMap(); + + /** + * Get an extension claim + */ + public Object getClaim(String key) { + return claims.get(key); + } + + /** + * Get a claim as a string + */ + public String getClaimAsString(String key) { + Object v = claims.get(key); + if (v != null) { + return v.toString(); + } else { + return null; + } + } + + /** + * Get a claim as a Date + */ + public Date getClaimAsDate(String key) { + Object v = claims.get(key); + if (v != null) { + if (v instanceof Date) { + return (Date) v; + } else if (v instanceof Long) { + return new Date((Long) v); + } else { + return null; + } + } else { + return null; + } + } + + /** + * Set an extension claim + */ + public void setClaim(String key, Object value) { + claims.put(key, value); + } + + /** + * Set a primitive claim + */ + public void setClaim(String key, JsonPrimitive prim) { + if (prim.isBoolean()) { + claims.put(key, prim.getAsBoolean()); + } else if (prim.isNumber()) { + claims.put(key, prim.getAsNumber()); + } else if (prim.isString()) { + claims.put(key, prim.getAsString()); + } + } + + /** + * Remove an extension claim + */ + public Object removeClaim(String key) { + return claims.remove(key); + } + + + /** + * Get a copy of this claim set as a JsonObject. The JsonObject is not + * backed by a live copy of this ClaimSet. + * @return a copy of the data in this header in a JsonObject + */ + public JsonObject getAsJsonObject() { + JsonObject o = new JsonObject(); + + if (this.claims != null) { + for (Map.Entry claim : this.claims.entrySet()) { + if (claim.getValue() instanceof JsonElement) { + o.add(claim.getKey(), (JsonElement)claim.getValue()); + } else if (claim.getValue() instanceof String) { + o.addProperty(claim.getKey(), (String)claim.getValue()); + } else if (claim.getValue() instanceof Number) { + o.addProperty(claim.getKey(), (Number)claim.getValue()); + } else if (claim.getValue() instanceof Boolean) { + o.addProperty(claim.getKey(), (Boolean)claim.getValue()); + } else if (claim.getValue() instanceof Character) { + o.addProperty(claim.getKey(), (Character)claim.getValue()); + } else if (claim.getValue() instanceof Date) { + // dates get serialized out as integers + o.addProperty(claim.getKey(), ((Date)claim.getValue()).getTime() / 1000L); + } else if (claim.getValue() != null) { + // try to put it in as a string + o.addProperty(claim.getKey(), claim.getValue().toString()); + } else { + // otherwise add in as a null + o.add(claim.getKey(), null); + } + } + } + + return o; + } + + +} diff --git a/src/main/java/org/mitre/jwt/model/JwtClaims.java b/src/main/java/org/mitre/jwt/model/JwtClaims.java index ef2136183..c98a5a726 100644 --- a/src/main/java/org/mitre/jwt/model/JwtClaims.java +++ b/src/main/java/org/mitre/jwt/model/JwtClaims.java @@ -12,34 +12,21 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -public class JwtClaims { +public class JwtClaims extends ClaimSet { + public static final String TYPE = "typ"; + public static final String JWT_ID = "jti"; + public static final String PRINCIPAL = "prn"; + public static final String AUDIENCE = "aud"; + public static final String ISSUER = "iss"; + public static final String ISSUED_AT = "iat"; + public static final String NOT_BEFORE = "nbf"; + public static final String EXPIRATION = "exp"; + /** * ISO8601 / RFC3339 Date Format */ - public static DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssz"); - - /* - * TODO: Should we instead be using a generic claims map with well-named accessor methods? - */ - - private Date expiration; - - private Date notBefore; - - private Date issuedAt; - - private String issuer; - - private String audience; - - private String principal; - - private String jwtId; - - private String type; - - private Map claims = new HashMap(); + //public static DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssz"); public JwtClaims() { @@ -47,36 +34,28 @@ public class JwtClaims { public JwtClaims(JsonObject json) { for (Entry element : json.entrySet()) { - if (element.getKey().equals("exp")) { - expiration = new Date(element.getValue().getAsLong() * 1000L); - } else if (element.getKey().equals("nbf")) { - notBefore = new Date(element.getValue().getAsLong() * 1000L); - } else if (element.getKey().equals("iat")) { - issuedAt = new Date(element.getValue().getAsLong() * 1000L); - } else if (element.getKey().equals("iss")) { - issuer = element.getValue().getAsString(); - } else if (element.getKey().equals("aud")) { - audience = element.getValue().getAsString(); - } else if (element.getKey().equals("prn")) { - principal = element.getValue().getAsString(); - } else if (element.getKey().equals("jti")) { - jwtId = element.getValue().getAsString(); - } else if (element.getKey().equals("typ")) { - type = element.getValue().getAsString(); + if (element.getKey().equals(EXPIRATION)) { + setExpiration(new Date(element.getValue().getAsLong() * 1000L)); + } else if (element.getKey().equals(NOT_BEFORE)) { + setNotBefore(new Date(element.getValue().getAsLong() * 1000L)); + } else if (element.getKey().equals(ISSUED_AT)) { + setIssuedAt(new Date(element.getValue().getAsLong() * 1000L)); + } else if (element.getKey().equals(ISSUER)) { + setIssuer(element.getValue().getAsString()); + } else if (element.getKey().equals(AUDIENCE)) { + setAudience(element.getValue().getAsString()); + } else if (element.getKey().equals(PRINCIPAL)) { + setPrincipal(element.getValue().getAsString()); + } else if (element.getKey().equals(JWT_ID)) { + setJwtId(element.getValue().getAsString()); + } else if (element.getKey().equals(TYPE)) { + setType(element.getValue().getAsString()); } else if (element.getValue().isJsonPrimitive()){ // we handle all primitives in here JsonPrimitive prim = element.getValue().getAsJsonPrimitive(); - - if (prim.isBoolean()) { - claims.put(element.getKey(), prim.getAsBoolean()); - } else if (prim.isNumber()) { - claims.put(element.getKey(), prim.getAsNumber()); - } else if (prim.isString()) { - claims.put(element.getKey(), prim.getAsString()); - } + setClaim(element.getKey(), prim); } else { - // everything else gets handled as a raw JsonElement - claims.put(element.getKey(), element.getValue()); + setClaim(element.getKey(), element.getValue()); } } } @@ -85,208 +64,113 @@ public class JwtClaims { * @return the expiration */ public Date getExpiration() { - return expiration; + return getClaimAsDate(EXPIRATION); } /** * @param expiration the expiration to set */ public void setExpiration(Date expiration) { - this.expiration = expiration; + setClaim(EXPIRATION, expiration); } /** * @return the notBefore */ public Date getNotBefore() { - return notBefore; + return getClaimAsDate(NOT_BEFORE); } /** * @param notBefore the notBefore to set */ public void setNotBefore(Date notBefore) { - this.notBefore = notBefore; + setClaim(NOT_BEFORE, notBefore); } /** * @return the issuedAt */ public Date getIssuedAt() { - return issuedAt; + return getClaimAsDate(ISSUED_AT); } /** * @param issuedAt the issuedAt to set */ public void setIssuedAt(Date issuedAt) { - this.issuedAt = issuedAt; + setClaim(ISSUED_AT, issuedAt); } /** * @return the issuer */ public String getIssuer() { - return issuer; + return getClaimAsString(ISSUER); } /** * @param issuer the issuer to set */ public void setIssuer(String issuer) { - this.issuer = issuer; + setClaim(ISSUER, issuer); } /** * @return the audience */ public String getAudience() { - return audience; + return getClaimAsString(AUDIENCE); } /** * @param audience the audience to set */ public void setAudience(String audience) { - this.audience = audience; + setClaim(AUDIENCE, audience); } /** * @return the principal */ public String getPrincipal() { - return principal; + return getClaimAsString(PRINCIPAL); } /** * @param principal the principal to set */ public void setPrincipal(String principal) { - this.principal = principal; + setClaim(AUDIENCE, principal); } /** * @return the jwtId */ public String getJwtId() { - return jwtId; + return getClaimAsString(JWT_ID); } /** * @param jwtId the jwtId to set */ public void setJwtId(String jwtId) { - this.jwtId = jwtId; + setClaim(JWT_ID, jwtId); } /** * @return the type */ public String getType() { - return type; + return getClaimAsString(TYPE); } /** * @param type the type to set */ public void setType(String type) { - this.type = type; - } - - /** - * Get an extension claim - */ - public Object getClaim(String key) { - return claims.get(key); + setClaim(TYPE, type); } - /** - * Set an extension claim - */ - public void setClaim(String key, Object value) { - claims.put(key, value); - } - - /** - * Remove an extension claim - */ - public Object removeClaim(String key) { - return claims.remove(key); - } - - /** - * Get a copy of this header as a JsonObject. The JsonObject is not - * backed by a live copy of this JwtHeader. - * @return a copy of the data in this header in a JsonObject - */ - public JsonObject getAsJsonObject() { - JsonObject o = new JsonObject(); - - if (this.expiration != null) { - o.addProperty("exp", this.expiration.getTime() / 1000L); - } - - if (this.notBefore != null) { - o.addProperty("nbf", this.notBefore.getTime() / 1000L); - } - - if (this.issuedAt != null) { - o.addProperty("iat", this.issuedAt.getTime() / 1000L); - } - - if (this.issuer != null) { - o.addProperty("iss", this.issuer); - } - - if (this.audience != null) { - o.addProperty("aud", this.audience); - } - - if (this.principal != null) { - o.addProperty("prn", this.principal); - } - - if (this.jwtId != null) { - o.addProperty("jti", this.jwtId); - } - - if (this.type != null) { - o.addProperty("typ", this.type); - } - - if (this.claims != null) { - for (Map.Entry claim : this.claims.entrySet()) { - if (claim.getValue() instanceof JsonElement) { - o.add(claim.getKey(), (JsonElement)claim.getValue()); - } else if (claim.getValue() instanceof String) { - o.addProperty(claim.getKey(), (String)claim.getValue()); - } else if (claim.getValue() instanceof Number) { - o.addProperty(claim.getKey(), (Number)claim.getValue()); - } else if (claim.getValue() instanceof Boolean) { - o.addProperty(claim.getKey(), (Boolean)claim.getValue()); - } else if (claim.getValue() instanceof Character) { - o.addProperty(claim.getKey(), (Character)claim.getValue()); - } else if (claim.getValue() != null) { - // try to put it in as a string - o.addProperty(claim.getKey(), claim.getValue().toString()); - } else { - // otherwise add in as a null - o.add(claim.getKey(), null); - } - } - } - - return o; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "JwtClaims [expiration=" + expiration + ", notBefore=" + notBefore + ", issuedAt=" + issuedAt + ", issuer=" + issuer + ", audience=" + audience + ", principal=" + principal + ", jwtId=" + jwtId + ", type=" + type + ", claims=" + claims + "]"; - } - - } diff --git a/src/main/java/org/mitre/jwt/model/JwtHeader.java b/src/main/java/org/mitre/jwt/model/JwtHeader.java index 099f6e786..5c44d9d3f 100644 --- a/src/main/java/org/mitre/jwt/model/JwtHeader.java +++ b/src/main/java/org/mitre/jwt/model/JwtHeader.java @@ -7,21 +7,12 @@ import java.util.Map.Entry; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -public class JwtHeader { +public class JwtHeader extends ClaimSet { - /* - * TODO: Should we instead be using a generic claims map with well-named accessor methods? - */ - - private String type; - - private String algorithm; - - private String encryptionMethod; - - private Map claims = new HashMap(); + public static final String TYPE = "typ"; + public static final String ALGORITHM = "alg"; + public static final String ENCRYPTION_METHOD = "enc"; - /** * Make an empty header */ @@ -36,15 +27,15 @@ public class JwtHeader { public JwtHeader(JsonObject json) { for (Entry element : json.entrySet()) { - if (element.getKey().equals("typ")) { - this.type = json.get("typ").getAsString(); - } else if (element.getKey().equals("alg")) { - this.algorithm = json.get("alg").getAsString(); - } else if (element.getKey().equals("enc")) { - this.encryptionMethod = json.get("enc").getAsString(); + if (element.getKey().equals(TYPE)) { + this.setType(json.get(TYPE).getAsString()); + } else if (element.getKey().equals(ALGORITHM)) { + this.setAlgorithm(json.get(ALGORITHM).getAsString()); + } else if (element.getKey().equals(ENCRYPTION_METHOD)) { + this.setEncryptionMethod(json.get(ENCRYPTION_METHOD).getAsString()); } else { // TODO: this assumes string encoding for extensions, probably not quite correct - claims.put(element.getKey(), element.getValue().getAsString()); + setClaim(element.getKey(), element.getValue().getAsString()); } } } @@ -53,7 +44,7 @@ public class JwtHeader { * @return the type */ public String getType() { - return type; + return getClaimAsString(TYPE); } @@ -61,7 +52,7 @@ public class JwtHeader { * @param type the type to set */ public void setType(String type) { - this.type = type; + setClaim(TYPE, type); } @@ -69,7 +60,7 @@ public class JwtHeader { * @return the algorithm */ public String getAlgorithm() { - return algorithm; + return getClaimAsString(ALGORITHM); } @@ -77,7 +68,7 @@ public class JwtHeader { * @param algorithm the algorithm to set */ public void setAlgorithm(String algorithm) { - this.algorithm = algorithm; + setClaim(ALGORITHM, algorithm); } @@ -85,7 +76,7 @@ public class JwtHeader { * @return the encryptionMethod */ public String getEncryptionMethod() { - return encryptionMethod; + return getClaimAsString(ENCRYPTION_METHOD); } @@ -93,80 +84,7 @@ public class JwtHeader { * @param encryptionMethod the encryptionMethod to set */ public void setEncryptionMethod(String encryptionMethod) { - this.encryptionMethod = encryptionMethod; + setClaim(ENCRYPTION_METHOD, encryptionMethod); } - /** - * Get an extension claim - */ - public Object getClaim(String key) { - return claims.get(key); - } - - /** - * Set an extension claim - */ - public void setClaim(String key, Object value) { - claims.put(key, value); - } - - /** - * Remove an extension claim - */ - public Object removeClaim(String key) { - return claims.remove(key); - } - - /** - * Get a copy of this header as a JsonObject. The JsonObject is not - * backed by a live copy of this JwtHeader. - * @return a copy of the data in this header in a JsonObject - */ - public JsonObject getAsJsonObject() { - JsonObject o = new JsonObject(); - - if (this.type != null) { - o.addProperty("typ", this.type); - } - if (this.algorithm != null) { - o.addProperty("alg", this.algorithm); - } - - if (this.encryptionMethod != null) { - o.addProperty("enc", this.encryptionMethod); - } - - if (this.claims != null) { - for (Map.Entry claim : this.claims.entrySet()) { - if (claim.getValue() instanceof String) { - o.addProperty(claim.getKey(), (String)claim.getValue()); - } else if (claim.getValue() instanceof Number) { - o.addProperty(claim.getKey(), (Number)claim.getValue()); - } else if (claim.getValue() instanceof Boolean) { - o.addProperty(claim.getKey(), (Boolean)claim.getValue()); - } else if (claim.getValue() instanceof Character) { - o.addProperty(claim.getKey(), (Character)claim.getValue()); - } else if (claim.getValue() != null) { - // try to put it in as a string - o.addProperty(claim.getKey(), claim.getValue().toString()); - } else { - // otherwise add in as a null - o.add(claim.getKey(), null); - } - } - } - - return o; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "JwtHeader [type=" + type + ", algorithm=" + algorithm + ", encryptionMethod=" + encryptionMethod + ", claims=" + claims + "]"; - } - - - } From febad617309414c85ec30b9932e1767aa83604b2 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 4 Jan 2012 10:34:22 -0500 Subject: [PATCH 2/8] jwt structures are claims based --- src/main/java/org/mitre/jwt/model/JwtClaims.java | 12 +++++++----- src/main/java/org/mitre/jwt/model/JwtHeader.java | 10 ++++++++-- src/test/java/org/mitre/jwt/JwtTest.java | 4 ++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/mitre/jwt/model/JwtClaims.java b/src/main/java/org/mitre/jwt/model/JwtClaims.java index c98a5a726..a50dc1971 100644 --- a/src/main/java/org/mitre/jwt/model/JwtClaims.java +++ b/src/main/java/org/mitre/jwt/model/JwtClaims.java @@ -50,12 +50,14 @@ public class JwtClaims extends ClaimSet { setJwtId(element.getValue().getAsString()); } else if (element.getKey().equals(TYPE)) { setType(element.getValue().getAsString()); - } else if (element.getValue().isJsonPrimitive()){ - // we handle all primitives in here - JsonPrimitive prim = element.getValue().getAsJsonPrimitive(); - setClaim(element.getKey(), prim); } else { - setClaim(element.getKey(), element.getValue()); + if (element.getValue().isJsonPrimitive()){ + // we handle all primitives in here + JsonPrimitive prim = element.getValue().getAsJsonPrimitive(); + setClaim(element.getKey(), prim); + } else { + setClaim(element.getKey(), element.getValue()); + } } } } diff --git a/src/main/java/org/mitre/jwt/model/JwtHeader.java b/src/main/java/org/mitre/jwt/model/JwtHeader.java index 5c44d9d3f..20a50a27e 100644 --- a/src/main/java/org/mitre/jwt/model/JwtHeader.java +++ b/src/main/java/org/mitre/jwt/model/JwtHeader.java @@ -6,6 +6,7 @@ import java.util.Map.Entry; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; public class JwtHeader extends ClaimSet { @@ -34,8 +35,13 @@ public class JwtHeader extends ClaimSet { } else if (element.getKey().equals(ENCRYPTION_METHOD)) { this.setEncryptionMethod(json.get(ENCRYPTION_METHOD).getAsString()); } else { - // TODO: this assumes string encoding for extensions, probably not quite correct - setClaim(element.getKey(), element.getValue().getAsString()); + if (element.getValue().isJsonPrimitive()){ + // we handle all primitives in here + JsonPrimitive prim = element.getValue().getAsJsonPrimitive(); + setClaim(element.getKey(), prim); + } else { + setClaim(element.getKey(), element.getValue()); + } } } } diff --git a/src/test/java/org/mitre/jwt/JwtTest.java b/src/test/java/org/mitre/jwt/JwtTest.java index e9650e3c8..36aa60c6c 100644 --- a/src/test/java/org/mitre/jwt/JwtTest.java +++ b/src/test/java/org/mitre/jwt/JwtTest.java @@ -21,8 +21,8 @@ public class JwtTest { public void testToStringPlaintext() { Jwt jwt = new Jwt(); jwt.getHeader().setAlgorithm("none"); - jwt.getClaims().setIssuer("joe"); jwt.getClaims().setExpiration(new Date(1300819380L * 1000L)); + jwt.getClaims().setIssuer("joe"); jwt.getClaims().setClaim("http://example.com/is_root", Boolean.TRUE); // sign it with a blank signature @@ -48,8 +48,8 @@ public class JwtTest { Jwt jwt = new Jwt(); jwt.getHeader().setType("JWT"); jwt.getHeader().setAlgorithm("HS256"); - jwt.getClaims().setIssuer("joe"); jwt.getClaims().setExpiration(new Date(1300819380L * 1000L)); + jwt.getClaims().setIssuer("joe"); jwt.getClaims().setClaim("http://example.com/is_root", Boolean.TRUE); // sign it From 4ce425eddcd2eacd60d33136bb910d5a50d19cf5 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 4 Jan 2012 10:41:43 -0500 Subject: [PATCH 3/8] tweaking maven config --- .classpath | 4 ++-- .settings/org.eclipse.wst.common.component | 4 ++-- src/main/java/org/mitre/jwt/model/ClaimSet.java | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.classpath b/.classpath index 6be21badf..9cdeb0e94 100644 --- a/.classpath +++ b/.classpath @@ -4,11 +4,11 @@ - - + + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 45ba36f2a..688e39a7e 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,11 +4,11 @@ - - + + diff --git a/src/main/java/org/mitre/jwt/model/ClaimSet.java b/src/main/java/org/mitre/jwt/model/ClaimSet.java index 9107afea7..badd967da 100644 --- a/src/main/java/org/mitre/jwt/model/ClaimSet.java +++ b/src/main/java/org/mitre/jwt/model/ClaimSet.java @@ -8,8 +8,16 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; +/** + * Generic container for JSON-based claims. Backed with a {@link Map} that preserves + * insertion order. Several convenience methods for getting and setting claims in different + * formats. + * @author jricher + * + */ public class ClaimSet { + // the LinkedHashMap preserves insertion order private Map claims = new LinkedHashMap(); /** @@ -85,9 +93,16 @@ public class ClaimSet { public JsonObject getAsJsonObject() { JsonObject o = new JsonObject(); + + /* + * We step through the claims object and serialize the internal values as + * appropriate to JsonElements. + */ + if (this.claims != null) { for (Map.Entry claim : this.claims.entrySet()) { if (claim.getValue() instanceof JsonElement) { + // raw JSON elements get passed through directly o.add(claim.getKey(), (JsonElement)claim.getValue()); } else if (claim.getValue() instanceof String) { o.addProperty(claim.getKey(), (String)claim.getValue()); From 988fcb4c9361d631e1bf336f890eceffa2ff1d14 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 4 Jan 2012 12:19:23 -0500 Subject: [PATCH 4/8] moved to multi-layer maven project --- .gitignore | 2 + pom.xml | 352 +--------------- server/.gitignore | 3 + server/pom.xml | 378 ++++++++++++++++++ .../java/org/mitre/jwt/model/ClaimSet.java | 0 .../main/java/org/mitre/jwt/model/Jwt.java | 0 .../java/org/mitre/jwt/model/JwtClaims.java | 0 .../java/org/mitre/jwt/model/JwtHeader.java | 0 .../mitre/jwt/signer/AbstractJwtSigner.java | 0 .../java/org/mitre/jwt/signer/JwtSigner.java | 0 .../mitre/jwt/signer/impl/Es256Signer.java | 0 .../mitre/jwt/signer/impl/Hmac256Signer.java | 0 .../jwt/signer/impl/PlaintextSigner.java | 0 .../mitre/jwt/signer/impl/Rs256Signer.java | 0 .../mitre/openid/connect/exception/empty.txt | 0 .../mitre/openid/connect/model/Address.java | 0 .../openid/connect/model/ApprovedSite.java | 0 .../org/mitre/openid/connect/model/Event.java | 0 .../mitre/openid/connect/model/IdToken.java | 0 .../mitre/openid/connect/model/UserInfo.java | 0 .../openid/connect/model/WhitelistedSite.java | 0 .../model/serializer/JSONIdTokenView.java | 0 .../model/serializer/JSONUserInfoView.java | 0 .../repository/ApprovedSiteRepository.java | 0 .../connect/repository/IdTokenRepository.java | 0 .../repository/UserInfoRepository.java | 0 .../repository/WhitelistedSiteRepository.java | 0 .../openid/connect/repository/impl/empty.txt | 0 .../mitre/openid/connect/service/empty.txt | 0 .../openid/connect/service/impl/empty.txt | 0 .../connect/web/AuthorizationEndpoint.java | 0 .../openid/connect/web/CheckIDEndpoint.java | 0 .../openid/connect/web/TokenEndpoint.java | 0 .../openid/connect/web/UserInfoEndpoint.java | 0 .../main/resources/META-INF/persistence.xml | 0 {src => server/src}/main/resources/log4j.xml | 0 .../WEB-INF/spring/appServlet/controllers.xml | 0 .../spring/appServlet/servlet-context.xml | 0 .../WEB-INF/spring/application-context.xml | 0 .../webapp/WEB-INF/spring/data-context.xml | 0 .../WEB-INF/spring/security-context.xml | 0 .../src}/main/webapp/WEB-INF/views/home.jsp | 0 .../src}/main/webapp/WEB-INF/web.xml | 0 .../src}/test/java/org/mitre/jwt/JwtTest.java | 0 .../java/org/mitre/openid/connect/empty.txt | 0 {src => server/src}/test/resources/log4j.xml | 0 46 files changed, 385 insertions(+), 350 deletions(-) create mode 100644 server/.gitignore create mode 100644 server/pom.xml rename {src => server/src}/main/java/org/mitre/jwt/model/ClaimSet.java (100%) rename {src => server/src}/main/java/org/mitre/jwt/model/Jwt.java (100%) rename {src => server/src}/main/java/org/mitre/jwt/model/JwtClaims.java (100%) rename {src => server/src}/main/java/org/mitre/jwt/model/JwtHeader.java (100%) rename {src => server/src}/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java (100%) rename {src => server/src}/main/java/org/mitre/jwt/signer/JwtSigner.java (100%) rename {src => server/src}/main/java/org/mitre/jwt/signer/impl/Es256Signer.java (100%) rename {src => server/src}/main/java/org/mitre/jwt/signer/impl/Hmac256Signer.java (100%) rename {src => server/src}/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java (100%) rename {src => server/src}/main/java/org/mitre/jwt/signer/impl/Rs256Signer.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/exception/empty.txt (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/model/Address.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/model/ApprovedSite.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/model/Event.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/model/IdToken.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/model/UserInfo.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/model/WhitelistedSite.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/repository/impl/empty.txt (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/service/empty.txt (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/service/impl/empty.txt (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/web/CheckIDEndpoint.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/web/TokenEndpoint.java (100%) rename {src => server/src}/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java (100%) rename {src => server/src}/main/resources/META-INF/persistence.xml (100%) rename {src => server/src}/main/resources/log4j.xml (100%) rename {src => server/src}/main/webapp/WEB-INF/spring/appServlet/controllers.xml (100%) rename {src => server/src}/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml (100%) rename {src => server/src}/main/webapp/WEB-INF/spring/application-context.xml (100%) rename {src => server/src}/main/webapp/WEB-INF/spring/data-context.xml (100%) rename {src => server/src}/main/webapp/WEB-INF/spring/security-context.xml (100%) rename {src => server/src}/main/webapp/WEB-INF/views/home.jsp (100%) rename {src => server/src}/main/webapp/WEB-INF/web.xml (100%) rename {src => server/src}/test/java/org/mitre/jwt/JwtTest.java (100%) rename {src => server/src}/test/java/org/mitre/openid/connect/empty.txt (100%) rename {src => server/src}/test/resources/log4j.xml (100%) diff --git a/.gitignore b/.gitignore index 5ce74ab6f..6fef6c8a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /local-values.conf /target +*~ + diff --git a/pom.xml b/pom.xml index 9b0d9b3ee..da6be30cf 100644 --- a/pom.xml +++ b/pom.xml @@ -3,12 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.mitre - openid + openid-parent OpenIdConnect pom 0.1 spring-security-oauth/spring-security-oauth2 + server 1.6 @@ -16,356 +17,7 @@ 1.5.10 3.1.0.RELEASE - - - - org.springframework - spring-orm - ${org.springframework-version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-aop - ${org.springframework-version} - - - org.springframework - spring-tx - ${org.springframework-version} - - - org.springframework - spring-webmvc - ${org.springframework-version} - - - - - org.slf4j - slf4j-api - ${org.slf4j-version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j-version} - runtime - - - org.slf4j - slf4j-log4j12 - ${org.slf4j-version} - runtime - - - log4j - log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - - - - - javax.inject - javax.inject - 1 - - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - jstl - 1.2 - - - - - junit - junit - 4.7 - test - - - org.easymock - easymock - 2.0 - test - - - org.springframework - spring-test - ${org.springframework-version} - test - - - com.h2database - h2 - 1.3.154 - test - - - cglib - cglib - 2.2 - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - build - - - - org.springframework.security - spring-security-core - ${spring.security.version} - - - org.springframework.security - spring-security-acl - ${spring.security.version} - - - org.springframework.security - spring-security-aspects - ${spring.security.version} - - - org.springframework.security - spring-security-config - ${spring.security.version} - - - org.springframework.security - spring-security-ldap - ${spring.security.version} - - - org.springframework.security - spring-security-openid - ${spring.security.version} - - - org.springframework.security - spring-security-taglibs - ${spring.security.version} - - - org.springframework.security - spring-security-web - ${spring.security.version} - - - com.google.code.gson - gson - 2.0 - - - org.eclipse.persistence - javax.persistence - 2.0.3 - - - org.eclipse.persistence - org.eclipse.persistence.jpa - 2.2.0 - - - commons-dbcp - commons-dbcp - 1.4 - - - com.google.guava - guava - 10.0.1 - - - org.apache.httpcomponents - httpclient - 4.1.1 - - - mysql - mysql-connector-java - 5.1.16 - - - commons-codec - commons-codec - 1.6 - - - org.bouncycastle - bcprov-jdk16 - 1.46 - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.2 - - - - - - - - - - - - - - - - - - - - - - - - - - com.google.code.gson - GSON repository - http://google-gson.googlecode.com/svn/mavenrepo/ - - - org.eclipse.persistence - EclipseLink repository - http://download.eclipse.org/rt/eclipselink/maven.repo - - true - - - Reference implementation of OpenID Connect spec (http://openid.net/connect/). - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java-version} - ${java-version} - - - - org.apache.maven.plugins - maven-war-plugin - - - prepare-war - prepare-package - - exploded - - - - - openid-connect-server - true - - - - org.apache.maven.plugins - maven-dependency-plugin - - - install - install - - sources - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - junit:junit - - **/*_Roo_* - - - - - org.codehaus.mojo - tomcat-maven-plugin - 1.0-beta-1 - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - xml - - - - org.apache.log4j.* - - - - - - - - - cobertura - package - - cobertura - - - - - - diff --git a/server/.gitignore b/server/.gitignore new file mode 100644 index 000000000..caf95e257 --- /dev/null +++ b/server/.gitignore @@ -0,0 +1,3 @@ +/local-values.conf +/target +*~ diff --git a/server/pom.xml b/server/pom.xml new file mode 100644 index 000000000..e81c7e994 --- /dev/null +++ b/server/pom.xml @@ -0,0 +1,378 @@ + + + 4.0.0 + org.mitre + openid + OpenIdConnect + war + 0.1 + + 1.6 + 3.0.6.RELEASE + 1.5.10 + 3.1.0.RELEASE + + + org.mitre + openid-parent + 0.1 + + + + org.springframework.security.oauth + 1.0.0.BUILD-SNAPSHOT + spring-security-oauth2 + + + + org.springframework + spring-orm + ${org.springframework-version} + + + + commons-logging + commons-logging + + + + + org.springframework + spring-aop + ${org.springframework-version} + + + org.springframework + spring-tx + ${org.springframework-version} + + + org.springframework + spring-webmvc + ${org.springframework-version} + + + + + org.slf4j + slf4j-api + ${org.slf4j-version} + + + org.slf4j + jcl-over-slf4j + ${org.slf4j-version} + runtime + + + org.slf4j + slf4j-log4j12 + ${org.slf4j-version} + runtime + + + log4j + log4j + 1.2.15 + + + javax.mail + mail + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + runtime + + + + + javax.inject + javax.inject + 1 + + + + + javax.servlet + servlet-api + 2.5 + provided + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + jstl + 1.2 + + + + + junit + junit + 4.7 + test + + + org.easymock + easymock + 2.0 + test + + + org.springframework + spring-test + ${org.springframework-version} + test + + + com.h2database + h2 + 1.3.154 + test + + + cglib + cglib + 2.2 + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.4 + build + + + + org.springframework.security + spring-security-core + ${spring.security.version} + + + org.springframework.security + spring-security-acl + ${spring.security.version} + + + org.springframework.security + spring-security-aspects + ${spring.security.version} + + + org.springframework.security + spring-security-config + ${spring.security.version} + + + org.springframework.security + spring-security-ldap + ${spring.security.version} + + + org.springframework.security + spring-security-openid + ${spring.security.version} + + + org.springframework.security + spring-security-taglibs + ${spring.security.version} + + + org.springframework.security + spring-security-web + ${spring.security.version} + + + com.google.code.gson + gson + 2.0 + + + org.eclipse.persistence + javax.persistence + 2.0.3 + + + org.eclipse.persistence + org.eclipse.persistence.jpa + 2.2.0 + + + commons-dbcp + commons-dbcp + 1.4 + + + com.google.guava + guava + 10.0.1 + + + org.apache.httpcomponents + httpclient + 4.1.1 + + + mysql + mysql-connector-java + 5.1.16 + + + commons-codec + commons-codec + 1.6 + + + org.bouncycastle + bcprov-jdk16 + 1.46 + + + org.codehaus.jackson + jackson-mapper-asl + 1.9.2 + + + + + + + + + + + + + + + + + + + + + + + + + + com.google.code.gson + GSON repository + http://google-gson.googlecode.com/svn/mavenrepo/ + + + org.eclipse.persistence + EclipseLink repository + http://download.eclipse.org/rt/eclipselink/maven.repo + + true + + + + Reference implementation of OpenID Connect spec (http://openid.net/connect/). + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java-version} + ${java-version} + + + + org.apache.maven.plugins + maven-war-plugin + + + prepare-war + prepare-package + + exploded + + + + + openid-connect-server + true + + + + org.apache.maven.plugins + maven-dependency-plugin + + + install + install + + sources + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + **/*_Roo_* + + + + + org.codehaus.mojo + tomcat-maven-plugin + 1.0-beta-1 + + + org.codehaus.mojo + cobertura-maven-plugin + 2.4 + + + xml + + + + org.apache.log4j.* + + + + + + + + + cobertura + package + + cobertura + + + + + + + diff --git a/src/main/java/org/mitre/jwt/model/ClaimSet.java b/server/src/main/java/org/mitre/jwt/model/ClaimSet.java similarity index 100% rename from src/main/java/org/mitre/jwt/model/ClaimSet.java rename to server/src/main/java/org/mitre/jwt/model/ClaimSet.java diff --git a/src/main/java/org/mitre/jwt/model/Jwt.java b/server/src/main/java/org/mitre/jwt/model/Jwt.java similarity index 100% rename from src/main/java/org/mitre/jwt/model/Jwt.java rename to server/src/main/java/org/mitre/jwt/model/Jwt.java diff --git a/src/main/java/org/mitre/jwt/model/JwtClaims.java b/server/src/main/java/org/mitre/jwt/model/JwtClaims.java similarity index 100% rename from src/main/java/org/mitre/jwt/model/JwtClaims.java rename to server/src/main/java/org/mitre/jwt/model/JwtClaims.java diff --git a/src/main/java/org/mitre/jwt/model/JwtHeader.java b/server/src/main/java/org/mitre/jwt/model/JwtHeader.java similarity index 100% rename from src/main/java/org/mitre/jwt/model/JwtHeader.java rename to server/src/main/java/org/mitre/jwt/model/JwtHeader.java diff --git a/src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java b/server/src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java similarity index 100% rename from src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java rename to server/src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java diff --git a/src/main/java/org/mitre/jwt/signer/JwtSigner.java b/server/src/main/java/org/mitre/jwt/signer/JwtSigner.java similarity index 100% rename from src/main/java/org/mitre/jwt/signer/JwtSigner.java rename to server/src/main/java/org/mitre/jwt/signer/JwtSigner.java diff --git a/src/main/java/org/mitre/jwt/signer/impl/Es256Signer.java b/server/src/main/java/org/mitre/jwt/signer/impl/Es256Signer.java similarity index 100% rename from src/main/java/org/mitre/jwt/signer/impl/Es256Signer.java rename to server/src/main/java/org/mitre/jwt/signer/impl/Es256Signer.java diff --git a/src/main/java/org/mitre/jwt/signer/impl/Hmac256Signer.java b/server/src/main/java/org/mitre/jwt/signer/impl/Hmac256Signer.java similarity index 100% rename from src/main/java/org/mitre/jwt/signer/impl/Hmac256Signer.java rename to server/src/main/java/org/mitre/jwt/signer/impl/Hmac256Signer.java diff --git a/src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java b/server/src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java similarity index 100% rename from src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java rename to server/src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java diff --git a/src/main/java/org/mitre/jwt/signer/impl/Rs256Signer.java b/server/src/main/java/org/mitre/jwt/signer/impl/Rs256Signer.java similarity index 100% rename from src/main/java/org/mitre/jwt/signer/impl/Rs256Signer.java rename to server/src/main/java/org/mitre/jwt/signer/impl/Rs256Signer.java diff --git a/src/main/java/org/mitre/openid/connect/exception/empty.txt b/server/src/main/java/org/mitre/openid/connect/exception/empty.txt similarity index 100% rename from src/main/java/org/mitre/openid/connect/exception/empty.txt rename to server/src/main/java/org/mitre/openid/connect/exception/empty.txt diff --git a/src/main/java/org/mitre/openid/connect/model/Address.java b/server/src/main/java/org/mitre/openid/connect/model/Address.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/model/Address.java rename to server/src/main/java/org/mitre/openid/connect/model/Address.java diff --git a/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java b/server/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/model/ApprovedSite.java rename to server/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java diff --git a/src/main/java/org/mitre/openid/connect/model/Event.java b/server/src/main/java/org/mitre/openid/connect/model/Event.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/model/Event.java rename to server/src/main/java/org/mitre/openid/connect/model/Event.java diff --git a/src/main/java/org/mitre/openid/connect/model/IdToken.java b/server/src/main/java/org/mitre/openid/connect/model/IdToken.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/model/IdToken.java rename to server/src/main/java/org/mitre/openid/connect/model/IdToken.java diff --git a/src/main/java/org/mitre/openid/connect/model/UserInfo.java b/server/src/main/java/org/mitre/openid/connect/model/UserInfo.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/model/UserInfo.java rename to server/src/main/java/org/mitre/openid/connect/model/UserInfo.java diff --git a/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java b/server/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java rename to server/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java diff --git a/src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java b/server/src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java rename to server/src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java diff --git a/src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java b/server/src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java rename to server/src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java diff --git a/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java b/server/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java rename to server/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java diff --git a/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java b/server/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java rename to server/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java diff --git a/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java b/server/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java rename to server/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java diff --git a/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java b/server/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java rename to server/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java diff --git a/src/main/java/org/mitre/openid/connect/repository/impl/empty.txt b/server/src/main/java/org/mitre/openid/connect/repository/impl/empty.txt similarity index 100% rename from src/main/java/org/mitre/openid/connect/repository/impl/empty.txt rename to server/src/main/java/org/mitre/openid/connect/repository/impl/empty.txt diff --git a/src/main/java/org/mitre/openid/connect/service/empty.txt b/server/src/main/java/org/mitre/openid/connect/service/empty.txt similarity index 100% rename from src/main/java/org/mitre/openid/connect/service/empty.txt rename to server/src/main/java/org/mitre/openid/connect/service/empty.txt diff --git a/src/main/java/org/mitre/openid/connect/service/impl/empty.txt b/server/src/main/java/org/mitre/openid/connect/service/impl/empty.txt similarity index 100% rename from src/main/java/org/mitre/openid/connect/service/impl/empty.txt rename to server/src/main/java/org/mitre/openid/connect/service/impl/empty.txt diff --git a/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java b/server/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java rename to server/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java diff --git a/src/main/java/org/mitre/openid/connect/web/CheckIDEndpoint.java b/server/src/main/java/org/mitre/openid/connect/web/CheckIDEndpoint.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/web/CheckIDEndpoint.java rename to server/src/main/java/org/mitre/openid/connect/web/CheckIDEndpoint.java diff --git a/src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java b/server/src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java rename to server/src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java diff --git a/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java b/server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java similarity index 100% rename from src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java rename to server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java diff --git a/src/main/resources/META-INF/persistence.xml b/server/src/main/resources/META-INF/persistence.xml similarity index 100% rename from src/main/resources/META-INF/persistence.xml rename to server/src/main/resources/META-INF/persistence.xml diff --git a/src/main/resources/log4j.xml b/server/src/main/resources/log4j.xml similarity index 100% rename from src/main/resources/log4j.xml rename to server/src/main/resources/log4j.xml diff --git a/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml b/server/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml similarity index 100% rename from src/main/webapp/WEB-INF/spring/appServlet/controllers.xml rename to server/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml diff --git a/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/server/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml similarity index 100% rename from src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml rename to server/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml diff --git a/src/main/webapp/WEB-INF/spring/application-context.xml b/server/src/main/webapp/WEB-INF/spring/application-context.xml similarity index 100% rename from src/main/webapp/WEB-INF/spring/application-context.xml rename to server/src/main/webapp/WEB-INF/spring/application-context.xml diff --git a/src/main/webapp/WEB-INF/spring/data-context.xml b/server/src/main/webapp/WEB-INF/spring/data-context.xml similarity index 100% rename from src/main/webapp/WEB-INF/spring/data-context.xml rename to server/src/main/webapp/WEB-INF/spring/data-context.xml diff --git a/src/main/webapp/WEB-INF/spring/security-context.xml b/server/src/main/webapp/WEB-INF/spring/security-context.xml similarity index 100% rename from src/main/webapp/WEB-INF/spring/security-context.xml rename to server/src/main/webapp/WEB-INF/spring/security-context.xml diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/server/src/main/webapp/WEB-INF/views/home.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/home.jsp rename to server/src/main/webapp/WEB-INF/views/home.jsp diff --git a/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from src/main/webapp/WEB-INF/web.xml rename to server/src/main/webapp/WEB-INF/web.xml diff --git a/src/test/java/org/mitre/jwt/JwtTest.java b/server/src/test/java/org/mitre/jwt/JwtTest.java similarity index 100% rename from src/test/java/org/mitre/jwt/JwtTest.java rename to server/src/test/java/org/mitre/jwt/JwtTest.java diff --git a/src/test/java/org/mitre/openid/connect/empty.txt b/server/src/test/java/org/mitre/openid/connect/empty.txt similarity index 100% rename from src/test/java/org/mitre/openid/connect/empty.txt rename to server/src/test/java/org/mitre/openid/connect/empty.txt diff --git a/src/test/resources/log4j.xml b/server/src/test/resources/log4j.xml similarity index 100% rename from src/test/resources/log4j.xml rename to server/src/test/resources/log4j.xml From 7790c16e6aeab7e055f5475e0191a5de55237431 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 4 Jan 2012 12:30:01 -0500 Subject: [PATCH 5/8] cleaned up project files --- .classpath | 24 ------ .project | 56 ------------- .../com.springsource.server.ide.jdt.core.xml | 2 - .settings/org.eclipse.ajdt.core.prefs | 43 ---------- .settings/org.eclipse.jdt.core.prefs | 13 ---- .settings/org.eclipse.wst.common.component | 15 ---- ....eclipse.wst.common.project.facet.core.xml | 7 -- .settings/org.eclipse.wst.validation.prefs | 6 -- .settings/org.maven.ide.eclipse.prefs | 9 --- ...ringframework.ide.eclipse.beans.core.prefs | 78 ------------------- ...org.springframework.ide.eclipse.core.prefs | 69 ---------------- .springBeans | 15 ---- 12 files changed, 337 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 .settings/com.springsource.server.ide.jdt.core.xml delete mode 100644 .settings/org.eclipse.ajdt.core.prefs delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 .settings/org.eclipse.wst.common.component delete mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 .settings/org.eclipse.wst.validation.prefs delete mode 100644 .settings/org.maven.ide.eclipse.prefs delete mode 100644 .settings/org.springframework.ide.eclipse.beans.core.prefs delete mode 100644 .settings/org.springframework.ide.eclipse.core.prefs delete mode 100644 .springBeans diff --git a/.classpath b/.classpath deleted file mode 100644 index 9cdeb0e94..000000000 --- a/.classpath +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.project b/.project deleted file mode 100644 index 9e70fd3c0..000000000 --- a/.project +++ /dev/null @@ -1,56 +0,0 @@ - - - OpenIDConnect - - - Servers - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.springframework.ide.eclipse.core.springbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - - org.maven.ide.eclipse.maven2Nature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.jsdt.core.jsNature - org.springframework.ide.eclipse.core.springnature - com.springsource.sts.roo.core.nature - org.eclipse.m2e.core.maven2Nature - - diff --git a/.settings/com.springsource.server.ide.jdt.core.xml b/.settings/com.springsource.server.ide.jdt.core.xml deleted file mode 100644 index 0a4413c52..000000000 --- a/.settings/com.springsource.server.ide.jdt.core.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/.settings/org.eclipse.ajdt.core.prefs b/.settings/org.eclipse.ajdt.core.prefs deleted file mode 100644 index 399482507..000000000 --- a/.settings/org.eclipse.ajdt.core.prefs +++ /dev/null @@ -1,43 +0,0 @@ -#Wed Oct 05 10:32:24 EDT 2011 -eclipse.preferences.version=1 -org.aspectj.ajdt.core.compiler.BuildOptions.showweavemessages=false -org.aspectj.ajdt.core.compiler.lint.BrokeSerialVersionCompatibility=ignore -org.aspectj.ajdt.core.compiler.lint.CannotImplementLazyTJP=ignore -org.aspectj.ajdt.core.compiler.lint.InvalidAbsoluteTypeName=warning -org.aspectj.ajdt.core.compiler.lint.NeedSerialVersionUIDField=ignore -org.aspectj.ajdt.core.compiler.lint.NoInterfaceCtorJoinpoint=warning -org.aspectj.ajdt.core.compiler.lint.ShadowNotInStructure=ignore -org.aspectj.ajdt.core.compiler.lint.TypeNotExposedToWeaver=warning -org.aspectj.ajdt.core.compiler.lint.UnresolvableMember=warning -org.aspectj.ajdt.core.compiler.lint.WildcardTypeName=ignore -org.aspectj.ajdt.core.compiler.lint.adviceDidNotMatch=warning -org.aspectj.ajdt.core.compiler.lint.annotationAsTargetForDecpIgnored=warning -org.aspectj.ajdt.core.compiler.lint.calculatingSerialVersionUID=ignore -org.aspectj.ajdt.core.compiler.lint.cantFindType=error -org.aspectj.ajdt.core.compiler.lint.cantFindTypeAffectingJPMatch=warning -org.aspectj.ajdt.core.compiler.lint.cantMatchArrayTypeOnVarargs=ignore -org.aspectj.ajdt.core.compiler.lint.elementAlreadyAnnotated=warning -org.aspectj.ajdt.core.compiler.lint.enumAsTargetForDecpIgnored=warning -org.aspectj.ajdt.core.compiler.lint.invalidTargetForAnnotation=warning -org.aspectj.ajdt.core.compiler.lint.multipleAdviceStoppingLazyTjp=ignore -org.aspectj.ajdt.core.compiler.lint.noExplicitConstructorCall=warning -org.aspectj.ajdt.core.compiler.lint.noGuardForLazyTjp=ignore -org.aspectj.ajdt.core.compiler.lint.noJoinpointsForBridgeMethods=warning -org.aspectj.ajdt.core.compiler.lint.runtimeExceptionNotSoftened=warning -org.aspectj.ajdt.core.compiler.lint.swallowedExceptionInCatchBlock=ignore -org.aspectj.ajdt.core.compiler.lint.uncheckedAdviceConversion=warning -org.aspectj.ajdt.core.compiler.lint.uncheckedArgument=warning -org.aspectj.ajdt.core.compiler.lint.unmatchedTargetKind=warning -org.aspectj.ajdt.core.compiler.lint.unorderedAdviceAtShadow=ignore -org.aspectj.ajdt.core.compiler.list.UnmatchedSuperTypeInCall=warning -org.aspectj.ajdt.core.compiler.weaver.XHasMember=false -org.aspectj.ajdt.core.compiler.weaver.XNoInline=false -org.aspectj.ajdt.core.compiler.weaver.XNotReweavable=false -org.aspectj.ajdt.core.compiler.weaver.XSerializableAspects=false -org.aspectj.ajdt.core.compiler.weaver.outxml=true -org.aspectj.ajdt.core.compiler.weaver.timers=false -org.aspectj.ajdt.core.compiler.weaver.verbose=false -org.aspectj.ajdt.core.complier.lint.aspectExcludedByConfiguration=ignore -org.eclipse.ajdt.core.builder.incrementalCompilationOptimizations=true -org.eclipse.ajdt.core.compiler.nonStandardOptions= -org.eclipse.ajdt.core.compiler.useProjectSettings=true diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index a96f78e59..000000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -#Mon Dec 12 16:22:28 EST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 688e39a7e..000000000 --- a/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 43b1e0cbd..000000000 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 75abca5ce..000000000 --- a/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Jun 06 17:00:12 BST 2008 -DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator; -USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator; -USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator; -USER_PREFERENCE=overrideGlobalPreferencesfalse -eclipse.preferences.version=1 diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 0b751087c..000000000 --- a/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Tue Mar 17 14:28:16 EDT 2009 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/.settings/org.springframework.ide.eclipse.beans.core.prefs b/.settings/org.springframework.ide.eclipse.beans.core.prefs deleted file mode 100644 index bb50bcf9a..000000000 --- a/.settings/org.springframework.ide.eclipse.beans.core.prefs +++ /dev/null @@ -1,78 +0,0 @@ -#Mon Oct 18 12:37:52 EDT 2010 -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.osgi.org/xmlns/blueprint/v1.0.0= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/aop= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/batch= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/beans= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/context= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/faces= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/flex= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/file= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/http= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/httpinvoker= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/ip= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/jdbc= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/jms= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/jmx= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/mail= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/rmi= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/security= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/stream= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/ws= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/integration/xml= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/jdbc= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/jee= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/jms= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/lang= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/mvc= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/osgi= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/osgi-compendium= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/oxm= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/p= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/security= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/task= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/tx= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/util= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/web-services= -//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/webflow-config= -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.osgi.org/xmlns/blueprint/v1.0.0=bp -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/aop=aop -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/batch=batch -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/beans=beans -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/context=context -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/faces=faces -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/flex=flex -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration=int -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/file=int-file -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/http=int-http -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/httpinvoker=int-httpinvoker -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/ip=int-ip -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/jdbc=int-jdbc -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/jms=int-jms -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/jmx=int-jmx -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/mail=int-mail -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/rmi=int-rmi -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/security=int-security -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/stream=int-stream -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/ws=int-ws -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/integration/xml=int-xml -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/jdbc=jdbc -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/jee=jee -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/jms=jms -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/lang=lang -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/mvc=mvc -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/osgi=osgi -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/osgi-compendium=osgix -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/oxm=oxm -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/p=p -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/security=sec -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/task=task -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/tx=tx -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/util=util -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/web-services=ws -//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/webflow-config=flow -eclipse.preferences.version=1 -org.springframework.ide.eclipse.beans.core.default.version.check.classpath=true -org.springframework.ide.eclipse.beans.core.enable.project.preferences=false -org.springframework.ide.eclipse.beans.core.ignoreMissingNamespaceHandler=false -org.springframework.ide.eclipse.beans.core.loadNamespaceHandlerFromClasspath=false diff --git a/.settings/org.springframework.ide.eclipse.core.prefs b/.settings/org.springframework.ide.eclipse.core.prefs deleted file mode 100644 index 0f65cd531..000000000 --- a/.settings/org.springframework.ide.eclipse.core.prefs +++ /dev/null @@ -1,69 +0,0 @@ -#Tue Apr 20 16:59:06 EDT 2010 -eclipse.preferences.version=1 -org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true -org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=true -org.springframework.ide.eclipse.core.builders.enable.osgibundleupdater=false -org.springframework.ide.eclipse.core.enable.project.preferences=false -org.springframework.ide.eclipse.core.validator.enable.com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.enable.com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.enable.com.springsource.sts.server.quickfix.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false -org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.applicationSymbolicNameRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.applicationVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleActivationPolicyRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleActivatorRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleManifestVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleNameRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleSymbolicNameRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.exportPackageRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.importRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.parsingProblemsRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.requireBundleRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.AvoidDriverManagerDataSource-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ImportElementsAtTopRulee-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ParentBeanSpecifiesAbstractClassRule-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.RefElementRule-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.TooManyBeansInFileRule-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UnnecessaryValueElementRule-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UseBeanInheritance-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.legacyxmlusage.jndiobjectfactory-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.importBundleVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.importLibraryVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.importPackageVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.requireBundleVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.autowire.autowire-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.toolAnnotation-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.action-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.actionstate-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attribute-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attributemapper-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.beanaction-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationaction-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationresult-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.exceptionhandler-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.import-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.inputattribute-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.mapping-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.outputattribute-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.set-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.state-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.subflowstate-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.transition-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.variable-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.webflowstate-org.springframework.ide.eclipse.webflow.core.validator=true diff --git a/.springBeans b/.springBeans deleted file mode 100644 index 385fd63a1..000000000 --- a/.springBeans +++ /dev/null @@ -1,15 +0,0 @@ - - - 1 - - - - - - - src/main/webapp/WEB-INF/spring/data-context.xml - src/main/webapp/WEB-INF/spring/security-context.xml - - - - From ceb91123b55e2eca21a8dbb90bbfd24a08a6b35f Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 4 Jan 2012 14:15:03 -0500 Subject: [PATCH 6/8] shuffled projects around so that it builds in maven and eclipse --- .gitignore | 1 + .project | 17 ++++++++ .settings/org.maven.ide.eclipse.prefs | 8 ++++ pom.xml | 2 +- server/.classpath | 15 +++++++ server/.project | 43 +++++++++++++++++++ server/.settings/.jsdtscope | 12 ++++++ .../com.springsource.sts.maven.prefs | 3 ++ server/.settings/org.eclipse.jdt.core.prefs | 9 ++++ .../org.eclipse.wst.common.component | 13 ++++++ ....eclipse.wst.common.project.facet.core.xml | 7 +++ ...rg.eclipse.wst.jsdt.ui.superType.container | 1 + .../org.eclipse.wst.jsdt.ui.superType.name | 1 + server/.settings/org.maven.ide.eclipse.prefs | 8 ++++ server/pom.xml | 6 +-- server/src/main/webapp/META-INF/MANIFEST.MF | 2 + 16 files changed, 144 insertions(+), 4 deletions(-) create mode 100644 .project create mode 100644 .settings/org.maven.ide.eclipse.prefs create mode 100644 server/.classpath create mode 100644 server/.project create mode 100644 server/.settings/.jsdtscope create mode 100644 server/.settings/com.springsource.sts.maven.prefs create mode 100644 server/.settings/org.eclipse.jdt.core.prefs create mode 100644 server/.settings/org.eclipse.wst.common.component create mode 100644 server/.settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 server/.settings/org.eclipse.wst.jsdt.ui.superType.container create mode 100644 server/.settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 server/.settings/org.maven.ide.eclipse.prefs create mode 100644 server/src/main/webapp/META-INF/MANIFEST.MF diff --git a/.gitignore b/.gitignore index 6fef6c8a2..fe032b224 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /local-values.conf /target *~ +/bin diff --git a/.project b/.project new file mode 100644 index 000000000..965bb02e4 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + OpenIDConnect + + + + + + org.maven.ide.eclipse.maven2Builder + + + + + + org.maven.ide.eclipse.maven2Nature + + diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..46d0bb234 --- /dev/null +++ b/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,8 @@ +#Wed Jan 04 13:38:09 EST 2012 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/pom.xml b/pom.xml index da6be30cf..43c219ae3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.mitre - openid-parent + openid-connect-parent OpenIdConnect pom 0.1 diff --git a/server/.classpath b/server/.classpath new file mode 100644 index 000000000..fc2725aa3 --- /dev/null +++ b/server/.classpath @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/server/.project b/server/.project new file mode 100644 index 000000000..d94333531 --- /dev/null +++ b/server/.project @@ -0,0 +1,43 @@ + + + openid + Reference implementation of OpenID Connect spec (http://openid.net/connect/). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + spring-security-oauth2 + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + + + org.maven.ide.eclipse.maven2Nature + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/server/.settings/.jsdtscope b/server/.settings/.jsdtscope new file mode 100644 index 000000000..b46b9207a --- /dev/null +++ b/server/.settings/.jsdtscope @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/server/.settings/com.springsource.sts.maven.prefs b/server/.settings/com.springsource.sts.maven.prefs new file mode 100644 index 000000000..ca1b6dc30 --- /dev/null +++ b/server/.settings/com.springsource.sts.maven.prefs @@ -0,0 +1,3 @@ +#Wed Jan 04 13:45:00 EST 2012 +com.springsource.sts.maven.maven.automatically.update=true +eclipse.preferences.version=1 diff --git a/server/.settings/org.eclipse.jdt.core.prefs b/server/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..34653a858 --- /dev/null +++ b/server/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +#Wed Jan 04 13:07:35 EST 2012 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/server/.settings/org.eclipse.wst.common.component b/server/.settings/org.eclipse.wst.common.component new file mode 100644 index 000000000..b21733a55 --- /dev/null +++ b/server/.settings/org.eclipse.wst.common.component @@ -0,0 +1,13 @@ + + + + + + + + uses + + + + + diff --git a/server/.settings/org.eclipse.wst.common.project.facet.core.xml b/server/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 000000000..9f1491f6f --- /dev/null +++ b/server/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/server/.settings/org.eclipse.wst.jsdt.ui.superType.container b/server/.settings/org.eclipse.wst.jsdt.ui.superType.container new file mode 100644 index 000000000..3bd5d0a48 --- /dev/null +++ b/server/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/server/.settings/org.eclipse.wst.jsdt.ui.superType.name b/server/.settings/org.eclipse.wst.jsdt.ui.superType.name new file mode 100644 index 000000000..05bd71b6e --- /dev/null +++ b/server/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -0,0 +1 @@ +Window \ No newline at end of file diff --git a/server/.settings/org.maven.ide.eclipse.prefs b/server/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..9210fb858 --- /dev/null +++ b/server/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,8 @@ +#Wed Jan 04 13:07:33 EST 2012 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/server/pom.xml b/server/pom.xml index e81c7e994..e32dd5d68 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.mitre - openid - OpenIdConnect + openid-connect-server + OpenIdConnect Server war 0.1 @@ -15,7 +15,7 @@ org.mitre - openid-parent + openid-connect-parent 0.1 diff --git a/server/src/main/webapp/META-INF/MANIFEST.MF b/server/src/main/webapp/META-INF/MANIFEST.MF new file mode 100644 index 000000000..58630c02e --- /dev/null +++ b/server/src/main/webapp/META-INF/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + From d7a3fa16528f01e57dd674d5266a8c625ce99d49 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 4 Jan 2012 14:57:59 -0500 Subject: [PATCH 7/8] trying to fix maven dependencies --- pom.xml | 2 +- server/.classpath | 1 + server/.settings/org.eclipse.wst.common.component | 1 + server/src/main/webapp/WEB-INF/web.xml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 43c219ae3..7e5b6a9b7 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 1.6 - 3.0.6.RELEASE + 3.1.0.RELEASE 1.5.10 3.1.0.RELEASE diff --git a/server/.classpath b/server/.classpath index fc2725aa3..6186af403 100644 --- a/server/.classpath +++ b/server/.classpath @@ -4,6 +4,7 @@ + diff --git a/server/.settings/org.eclipse.wst.common.component b/server/.settings/org.eclipse.wst.common.component index b21733a55..56a002a7c 100644 --- a/server/.settings/org.eclipse.wst.common.component +++ b/server/.settings/org.eclipse.wst.common.component @@ -4,6 +4,7 @@ + uses diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml index b6cc56cda..110172899 100644 --- a/server/src/main/webapp/WEB-INF/web.xml +++ b/server/src/main/webapp/WEB-INF/web.xml @@ -6,7 +6,7 @@ contextConfigLocation - /WEB-INF/spring/root-context.xml + /WEB-INF/spring/application-context.xml From 4db5d508642ef449b748bd46e114cd8faf83d654 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 4 Jan 2012 15:40:22 -0500 Subject: [PATCH 8/8] it builds --- pom.xml | 2 +- server/pom.xml | 17 ++++++++++++++++- .../webapp/WEB-INF/spring/security-context.xml | 10 +++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7e5b6a9b7..c8f498bed 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 1.6 - 3.1.0.RELEASE + 3.1.0.RELEASE 1.5.10 3.1.0.RELEASE diff --git a/server/pom.xml b/server/pom.xml index e32dd5d68..fdfa539d7 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -9,7 +9,7 @@ 0.1 1.6 - 3.0.6.RELEASE + 3.1.0.RELEASE 1.5.10 3.1.0.RELEASE @@ -25,6 +25,21 @@ spring-security-oauth2 + + org.springframework + spring-core + ${org.springframework-version} + + + org.springframework + spring-expression + ${org.springframework-version} + + + org.springframework + spring-context + ${org.springframework-version} + org.springframework spring-orm diff --git a/server/src/main/webapp/WEB-INF/spring/security-context.xml b/server/src/main/webapp/WEB-INF/spring/security-context.xml index a3b661d46..64f80274d 100644 --- a/server/src/main/webapp/WEB-INF/spring/security-context.xml +++ b/server/src/main/webapp/WEB-INF/spring/security-context.xml @@ -14,6 +14,14 @@ - + + + + + + + + +