You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/05/16 15:07:16 UTC

[cxf-fediz] branch master updated: cleanup (#42)

This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git


The following commit(s) were added to refs/heads/master by this push:
     new c49cb43  cleanup (#42)
c49cb43 is described below

commit c49cb43d759c83ffb75afe342a05a93db75c7349
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu May 16 18:07:11 2019 +0300

    cleanup (#42)
---
 services/idp-core/pom.xml                                      | 10 ----------
 services/idp-core/src/main/filters/realm-a/env.properties      |  6 ------
 services/idp-core/src/main/filters/realm-b/env.properties      |  6 ------
 .../main/webapp/WEB-INF/config/security-clientcert-config.xml  |  3 ---
 .../idp/src/main/webapp/WEB-INF/config/security-krb-config.xml |  6 ------
 .../idp/src/main/webapp/WEB-INF/config/security-rs-config.xml  |  6 ------
 .../idp/src/main/webapp/WEB-INF/config/security-up-config.xml  |  6 ------
 7 files changed, 43 deletions(-)

diff --git a/services/idp-core/pom.xml b/services/idp-core/pom.xml
index da5bb0b..dd25126 100644
--- a/services/idp-core/pom.xml
+++ b/services/idp-core/pom.xml
@@ -182,11 +182,6 @@
             <version>${hsqldb.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>3.2.5</version>
-        </dependency>
         <!-- 
         <dependency>
             <groupId>org.apache.openjpa</groupId>
@@ -220,11 +215,6 @@
             <version>${javax.validation.version}</version>
         </dependency>
         <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.bval</groupId>
             <artifactId>bval-jsr</artifactId>
             <version>${bval.version}</version>
diff --git a/services/idp-core/src/main/filters/realm-a/env.properties b/services/idp-core/src/main/filters/realm-a/env.properties
deleted file mode 100644
index dd59a8b..0000000
--- a/services/idp-core/src/main/filters/realm-a/env.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-realm.STS_URI=REALMA
-realmA.port=9443
-realmB.port=12443
-idp-config=idp-config-realma.xml
-db-load-config=entities-realma.xml
-realm-uri=urn:org:apache:cxf:fediz:idp:realm-A
\ No newline at end of file
diff --git a/services/idp-core/src/main/filters/realm-b/env.properties b/services/idp-core/src/main/filters/realm-b/env.properties
deleted file mode 100644
index d3134fd..0000000
--- a/services/idp-core/src/main/filters/realm-b/env.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-realm.STS_URI=REALMB
-realmA.port=9443
-realmB.port=12443
-idp-config=idp-config-realmb.xml
-db-load-config=entities-realmb.xml
-realm-uri=urn:org:apache:cxf:fediz:idp:realm-B
\ No newline at end of file
diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
index 53fc270..80e77db 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
@@ -20,13 +20,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     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
-        http://www.springframework.org/schema/context
-        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
diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
index 826c032..98e82a0 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
@@ -20,17 +20,11 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     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
-        http://www.springframework.org/schema/context
-        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
         ">
 
     <!-- DISABLE in production as it might log confidential information about the user -->
diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml
index c739a00..c01a630 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml
@@ -20,17 +20,11 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     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
-        http://www.springframework.org/schema/context
-        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
         ">
 
     <!-- DISABLE in production as it might log confidential information about the user -->
diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
index 284504d..458a869 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
@@ -20,17 +20,11 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     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
-        http://www.springframework.org/schema/context
-        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
         ">
 
     <!-- DISABLE in production as it might log confidential information about the user -->