Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 856c0ea

Browse files
author
Justin Richer
committedJul 29, 2013
Merge commit '023dd440d4a0e6e59a14c88013837d79a77c74e0' into 1.1-merge
Conflicts: openid-connect-client/pom.xml openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionAuthorityGranter.java openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionUrlProvider.java openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisherMapping.java openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/JwkViewResolver.java openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/AuthRequestUrlBuilder.java openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ClientConfigurationService.java openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticClientConfigurationService.java openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticServerConfigurationService.java openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticSingleIssuerService.java openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/ThirdPartyIssuerService.java openid-connect-client/src/test/java/org/mitre/openid/connect/client/AbstractOIDCAuthenticationFilterTest.java openid-connect-common/pom.xml openid-connect-common/src/main/java/org/mitre/jose/keystore/JWKSetKeyStore.java openid-connect-common/src/main/java/org/mitre/jwt/signer/service/JwtSigningAndValidationService.java openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthorizationCodeEntity.java openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java openid-connect-common/src/main/java/org/mitre/oauth2/model/SystemScope.java openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthorizationCodeRepository.java openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2TokenRepository.java openid-connect-common/src/main/java/org/mitre/oauth2/service/OAuth2TokenEntityService.java openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java openid-connect-common/src/main/java/org/mitre/openid/connect/config/ServerConfiguration.java openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java openid-connect-common/src/main/java/org/mitre/openid/connect/model/BlacklistedSite.java openid-connect-common/src/main/java/org/mitre/openid/connect/model/Event.java openid-connect-common/src/main/java/org/mitre/openid/connect/model/OIDCAuthenticationToken.java openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java openid-connect-server/.gitignore openid-connect-server/pom.xml openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthorizationCodeRepository.java openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java openid-connect-server/src/main/java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospectionView.java openid-connect-server/src/main/java/org/mitre/oauth2/web/IntrospectionEndpoint.java openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java openid-connect-server/src/main/java/org/mitre/oauth2/web/RevocationEndpoint.java openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectOAuth2RequestFactory.java openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerAuthenticationProvider.java openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerClientAssertionTokenEndpointFilter.java openid-connect-server/src/main/java/org/mitre/openid/connect/exception/InvalidJwtSignatureException.java openid-connect-server/src/main/java/org/mitre/openid/connect/exception/UnknownUserInfoSchemaException.java openid-connect-server/src/main/java/org/mitre/openid/connect/exception/UserNotFoundException.java openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaApprovedSiteRepository.java openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaUserInfoRepository.java openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultNonceService.java openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultWhitelistedSiteService.java openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java openid-connect-server/src/main/java/org/mitre/openid/connect/view/AbstractClientEntityView.java openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientInformationResponseView.java openid-connect-server/src/main/java/org/mitre/openid/connect/view/ExceptionAsJSONView.java openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonEntityView.java openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonErrorView.java openid-connect-server/src/main/java/org/mitre/openid/connect/view/POCOUserInfoView.java openid-connect-server/src/main/java/org/mitre/openid/connect/view/StatsSummary.java openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java openid-connect-server/src/main/java/org/mitre/openid/connect/web/ApprovedSiteAPI.java openid-connect-server/src/main/java/org/mitre/openid/connect/web/BlacklistAPI.java openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java openid-connect-server/src/main/java/org/mitre/openid/connect/web/ManagerController.java openid-connect-server/src/main/java/org/mitre/openid/connect/web/RequestObjectAuthorizationEndpoint.java openid-connect-server/src/main/java/org/mitre/openid/connect/web/StatsAPI.java openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java openid-connect-server/src/main/java/org/mitre/openid/connect/web/WhitelistAPI.java openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag openid-connect-server/src/main/webapp/WEB-INF/tags/breadcrumbs.tag openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag openid-connect-server/src/main/webapp/WEB-INF/tags/copyright.tag openid-connect-server/src/main/webapp/WEB-INF/tags/header.tag openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag openid-connect-server/src/main/webapp/WEB-INF/tags/sidebar.tag openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag openid-connect-server/src/main/webapp/WEB-INF/tags/topbar.tag openid-connect-server/src/main/webapp/WEB-INF/views/about.jsp openid-connect-server/src/main/webapp/WEB-INF/views/approve.jsp openid-connect-server/src/main/webapp/WEB-INF/views/contact.jsp openid-connect-server/src/main/webapp/WEB-INF/views/exception/usernotfound.jsp openid-connect-server/src/main/webapp/WEB-INF/views/login.jsp openid-connect-server/src/main/webapp/WEB-INF/views/manage.jsp openid-connect-server/src/main/webapp/WEB-INF/views/stats.jsp pom.xml
2 parents 2087185 + 023dd44 commit 856c0ea

File tree

242 files changed

+10376
-2265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+10376
-2265
lines changed
 

‎.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
11
language: java
2-
before_install:
3-
- git submodule update --init --recursive
4-
jdk:
5-
- openjdk6
6-
install: echo 'skip this step...'
7-
script: mvn -Dmaven.javadoc.skip=true test

‎README.txt

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,33 @@
1-
An OpenID Connect reference implementation in Java on the Spring platform.
1+
An OpenID Connect reference implementation in Java on the Spring platform. For license information see LICENSE.txt.
22

33
This code includes a functioning server (IdP) and client (RP) as well as utility libraries.
44

5-
Authors: Justin Richer, Amanda Anganes, Michael Walsh, Michael Jett, Steve Moore, Mike Derryberry
5+
The project homepage on GitHub is:
66

7-
Copyright 2012, The MITRE Corporation (http://www.mitre.org/)
7+
https://github.com/mitreid-connect/
88

9+
Full documentation can be found online:
910

11+
https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/wiki
12+
13+
Documentation for the Maven project and Java API can be found at:
14+
15+
http://mitreid-connect.github.com/
16+
17+
Issues can be reported at:
18+
19+
https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/issues
20+
21+
The mailing list for the project can be found at mitreid-connect@mit.edu, with archives available online:
22+
23+
https://mailman.mit.edu/mailman/listinfo/mitreid-connect
24+
25+
26+
27+
Authors: Justin Richer, Amanda Anganes, Michael Walsh, Michael Jett, Steve Moore, Mike Derryberry, William Kim
28+
29+
30+
31+
32+
Copyright 2013, The MITRE Corporation (http://www.mitre.org/)
33+
and the MIT Kerberos and Internet Trust Consortium (http://kit.mit.edu/)

0 commit comments

Comments
 (0)
Please sign in to comment.