Repository: cxf-fediz Updated Branches: refs/heads/master 61f6c7e6e -> 6f28a5a15
Moving ApplicationContextProvider to an hrd package which is where it is needed Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6f28a5a1 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6f28a5a1 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6f28a5a1 Branch: refs/heads/master Commit: 6f28a5a15787618b58f40a1c39b679dda41168a5 Parents: 61f6c7e Author: Sergey Beryozkin <[email protected]> Authored: Mon Feb 8 14:56:16 2016 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Mon Feb 8 14:56:16 2016 +0000 ---------------------------------------------------------------------- .../oidc/ApplicationContextProvider.java | 35 -------------------- .../handler/hrd/ApplicationContextProvider.java | 35 ++++++++++++++++++++ .../handler/hrd/ClientIdHomeRealmDiscovery.java | 1 - .../src/main/webapp/WEB-INF/data-manager.xml | 2 +- 4 files changed, 36 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6f28a5a1/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ApplicationContextProvider.java ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ApplicationContextProvider.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ApplicationContextProvider.java deleted file mode 100644 index 83e2ec8..0000000 --- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ApplicationContextProvider.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.fediz.service.oidc; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; - -public class ApplicationContextProvider implements ApplicationContextAware { - private static ApplicationContext context; - - public static ApplicationContext getApplicationContext() { - return context; - } - - @Override - public void setApplicationContext(ApplicationContext ctx) { - context = ctx; - } -} http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6f28a5a1/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/handler/hrd/ApplicationContextProvider.java ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/handler/hrd/ApplicationContextProvider.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/handler/hrd/ApplicationContextProvider.java new file mode 100644 index 0000000..e18ebff --- /dev/null +++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/handler/hrd/ApplicationContextProvider.java @@ -0,0 +1,35 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.fediz.service.oidc.handler.hrd; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; + +public class ApplicationContextProvider implements ApplicationContextAware { + private static ApplicationContext context; + + public static ApplicationContext getApplicationContext() { + return context; + } + + @Override + public void setApplicationContext(ApplicationContext ctx) { + context = ctx; + } +} http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6f28a5a1/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/handler/hrd/ClientIdHomeRealmDiscovery.java ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/handler/hrd/ClientIdHomeRealmDiscovery.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/handler/hrd/ClientIdHomeRealmDiscovery.java index a8d3d2a..5fc186f 100644 --- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/handler/hrd/ClientIdHomeRealmDiscovery.java +++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/handler/hrd/ClientIdHomeRealmDiscovery.java @@ -27,7 +27,6 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.servlet.http.HttpServletRequest; import org.apache.cxf.fediz.core.spi.HomeRealmCallback; -import org.apache.cxf.fediz.service.oidc.ApplicationContextProvider; import org.apache.cxf.fediz.service.oidc.FedizClient; import org.apache.cxf.fediz.service.oidc.OAuthDataManager; import org.apache.cxf.rs.security.oauth2.common.Client; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6f28a5a1/services/oidc/src/main/webapp/WEB-INF/data-manager.xml ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/data-manager.xml b/services/oidc/src/main/webapp/WEB-INF/data-manager.xml index 9bd2c38..25c9741 100644 --- a/services/oidc/src/main/webapp/WEB-INF/data-manager.xml +++ b/services/oidc/src/main/webapp/WEB-INF/data-manager.xml @@ -27,7 +27,7 @@ http://www.springframework.org/schema/util/spring-util.xsd "> - <bean id="applicationContextProvider" class="org.apache.cxf.fediz.service.oidc.ApplicationContextProvider"/> + <bean id="applicationContextProvider" class="org.apache.cxf.fediz.service.oidc.handler.hrd.ApplicationContextProvider"/> <util:map id="supportedScopes"> <entry key="openid" value="Access the authentication claims" />
