Repository: cxf-fediz Updated Branches: refs/heads/master 54adad652 -> be7868b69
Removing some unnecessary stuff from the IdP config files Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/7fa6e4ea Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/7fa6e4ea Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/7fa6e4ea Branch: refs/heads/master Commit: 7fa6e4ea596ef7085649ad11374fc8a91367ae88 Parents: 54adad6 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Dec 9 17:17:53 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Dec 9 17:17:53 2016 +0000 ---------------------------------------------------------------------- services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml | 2 +- services/idp/src/main/webapp/WEB-INF/idp-servlet.xml | 1 - services/idp/src/main/webapp/WEB-INF/security-config.xml | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7fa6e4ea/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml b/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml index 1bba46e..8a8760a 100644 --- a/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml +++ b/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml @@ -28,7 +28,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd + http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd";> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7fa6e4ea/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml b/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml index eebda37..e7c24ee 100644 --- a/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml +++ b/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml @@ -19,7 +19,6 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:webflow="http://www.springframework.org/schema/webflow-config"; xmlns:context="http://www.springframework.org/schema/context"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7fa6e4ea/services/idp/src/main/webapp/WEB-INF/security-config.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/security-config.xml b/services/idp/src/main/webapp/WEB-INF/security-config.xml index b25b903..e51f906 100644 --- a/services/idp/src/main/webapp/WEB-INF/security-config.xml +++ b/services/idp/src/main/webapp/WEB-INF/security-config.xml @@ -21,7 +21,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:security="http://www.springframework.org/schema/security"; xmlns:context="http://www.springframework.org/schema/context"; - xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd @@ -29,8 +28,6 @@ http://www.springframework.org/schema/context/spring-context-4.3.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd - http://www.springframework.org/schema/util - http://www.springframework.org/schema/util/spring-util-4.3.xsd "> <context:property-placeholder location="classpath:realm.properties" />
