[java-identity-provider] branch main updated: Remove now-unused idp-conf module.
Scott Cantor
cantor.2 at osu.edu
Tue May 16 17:29:04 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=a060c0b3c7ffc1407aab0f09413d4e31570e833e
The following commit(s) were added to refs/heads/main by this push:
new a060c0b3c Remove now-unused idp-conf module.
a060c0b3c is described below
commit a060c0b3c7ffc1407aab0f09413d4e31570e833e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue May 16 13:27:34 2023 -0400
Remove now-unused idp-conf module.
---
idp-bom/pom.xml | 5 --
idp-conf/.checkstyle | 15 -----
idp-conf/.gitignore | 2 -
idp-conf/pom.xml | 68 ----------------------
idp-conf/src/main/java/.gitkeep | 0
idp-conf/src/main/resources/.gitignore | 1 -
idp-conf/src/main/resources/conf/.gitkeep | 0
idp-conf/src/main/resources/flows/.gitkeep | 0
idp-conf/src/main/resources/messages/.gitkeep | 0
idp-conf/src/main/resources/metadata/.gitkeep | 0
idp-conf/src/main/resources/system/DONOTTOUCH | 11 ----
.../main/resources/system/conf/global-system.xml | 19 ------
.../src/main/resources/system/conf/mvc-beans.xml | 18 ------
.../main/resources/system/conf/webflow-config.xml | 15 -----
idp-conf/src/main/resources/views/.gitkeep | 0
idp-conf/src/test/resources/logback-test.xml | 17 ------
idp-distribution/pom.xml | 20 -------
idp-parent/pom.xml | 1 -
18 files changed, 192 deletions(-)
diff --git a/idp-bom/pom.xml b/idp-bom/pom.xml
index 402db2c63..147288592 100644
--- a/idp-bom/pom.xml
+++ b/idp-bom/pom.xml
@@ -129,11 +129,6 @@
<artifactId>idp-installer</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-conf</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-conf-impl</artifactId>
diff --git a/idp-conf/.checkstyle b/idp-conf/.checkstyle
deleted file mode 100644
index d3fc685e1..000000000
--- a/idp-conf/.checkstyle
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
-
- <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
-
-</fileset-config>
diff --git a/idp-conf/.gitignore b/idp-conf/.gitignore
deleted file mode 100644
index 1df25bfc8..000000000
--- a/idp-conf/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/test-output
-/target
diff --git a/idp-conf/pom.xml b/idp-conf/pom.xml
deleted file mode 100644
index 7cfcb637c..000000000
--- a/idp-conf/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-parent</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <relativePath>../idp-parent</relativePath>
- </parent>
-
- <name>Shibboleth IdP :: Configuration Files (Deprecated)</name>
- <description>Configuration Files (Deprecated)</description>
- <artifactId>idp-conf</artifactId>
- <packaging>jar</packaging>
-
- <properties>
- <automatic.module.name>net.shibboleth.idp.conf</automatic.module.name>
- </properties>
-
- <dependencies>
- <!-- Compile Dependencies -->
-
- <!-- Provided Dependencies -->
-
- <!-- Runtime Dependencies -->
-
- <!-- Test Dependencies -->
-
- </dependencies>
-
- <profiles>
- <!--
- Pull in a Javascript engine for testing in Java
- versions where the JDK doesn't provide one.
- -->
- <profile>
- <id>get-nashorn</id>
- <activation>
- <jdk>[15,</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.openjdk.nashorn</groupId>
- <artifactId>nashorn-core</artifactId>
- <version>${nashorn.jdk.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <scm>
- <connection>${shibboleth.scm.connection}java-identity-provider</connection>
- <developerConnection>${shibboleth.scm.developerConnection}java-identity-provider</developerConnection>
- <url>${shibboleth.scm.url}java-identity-provider.git</url>
- </scm>
-
- <distributionManagement>
- <site>
- <id>site</id>
- <url>scp:${idp-module.site.url}</url>
- </site>
- </distributionManagement>
-
-</project>
diff --git a/idp-conf/src/main/java/.gitkeep b/idp-conf/src/main/java/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/idp-conf/src/main/resources/.gitignore b/idp-conf/src/main/resources/.gitignore
deleted file mode 100644
index b6d592eb2..000000000
--- a/idp-conf/src/main/resources/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/logs
diff --git a/idp-conf/src/main/resources/conf/.gitkeep b/idp-conf/src/main/resources/conf/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/idp-conf/src/main/resources/flows/.gitkeep b/idp-conf/src/main/resources/flows/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/idp-conf/src/main/resources/messages/.gitkeep b/idp-conf/src/main/resources/messages/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/idp-conf/src/main/resources/metadata/.gitkeep b/idp-conf/src/main/resources/metadata/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/idp-conf/src/main/resources/system/DONOTTOUCH b/idp-conf/src/main/resources/system/DONOTTOUCH
deleted file mode 100644
index 06e7f0122..000000000
--- a/idp-conf/src/main/resources/system/DONOTTOUCH
+++ /dev/null
@@ -1,11 +0,0 @@
-WARNING: The files in the system/ tree should not be modified.
-
-Future upgrades will overwrite these files without regard for local
-modifications. This is necessary to allow alteration of system internals
-to support new features, correct bugs, change implementation classes, etc.
-
-If you make changes to these files, you should back them up across upgrades,
-and are solely responsible for re-applying local changes.
-
-Please consider filing enhancement requests if there are changes you feel
-are necessary so that future versions might better accommodate your needs.
diff --git a/idp-conf/src/main/resources/system/conf/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
deleted file mode 100644
index 3a81eb4a4..000000000
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <!-- This is a stub pending the eventual requirement to update web.xml -->
-
- <import resource="classpath:/net/shibboleth/idp/conf/global-system.xml" />
-
- </beans>
diff --git a/idp-conf/src/main/resources/system/conf/mvc-beans.xml b/idp-conf/src/main/resources/system/conf/mvc-beans.xml
deleted file mode 100644
index 9c2e4a440..000000000
--- a/idp-conf/src/main/resources/system/conf/mvc-beans.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:mvc="http://www.springframework.org/schema/mvc"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
- <!-- This is a stub pending the eventual requirement to update web.xml -->
-
- <import resource="classpath:/net/shibboleth/idp/conf/mvc-beans.xml" />
-
-</beans>
diff --git a/idp-conf/src/main/resources/system/conf/webflow-config.xml b/idp-conf/src/main/resources/system/conf/webflow-config.xml
deleted file mode 100644
index 2d8611046..000000000
--- a/idp-conf/src/main/resources/system/conf/webflow-config.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:webflow="http://www.springframework.org/schema/webflow-config"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd">
-
- <!-- This is a stub pending the eventual requirement to update web.xml -->
-
- <import resource="classpath:/net/shibboleth/idp/conf/webflow-config.xml" />
-
-</beans>
diff --git a/idp-conf/src/main/resources/views/.gitkeep b/idp-conf/src/main/resources/views/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/idp-conf/src/test/resources/logback-test.xml b/idp-conf/src/test/resources/logback-test.xml
deleted file mode 100644
index 8f891b483..000000000
--- a/idp-conf/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%level [%logger:%line] - %msg%n</pattern>
- <charset>UTF-8</charset>
- </encoder>
- </appender>
-
- <root>
- <level value="DEBUG" />
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/idp-distribution/pom.xml b/idp-distribution/pom.xml
index 01d5bc7bd..7a5eedb09 100644
--- a/idp-distribution/pom.xml
+++ b/idp-distribution/pom.xml
@@ -160,26 +160,6 @@
</artifactItems>
</configuration>
</execution>
- <!-- Unpack idp-conf to assembly directory. -->
- <execution>
- <id>unpack-idp-conf</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-conf</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <outputDirectory>${idp.assemblyDirectory}</outputDirectory>
- <excludes>**/META-INF/**,**/logs/*</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
<!-- Copy runtime dependencies to bin\lib directory. -->
<execution>
<id>copy-runtime-dependencies</id>
diff --git a/idp-parent/pom.xml b/idp-parent/pom.xml
index 87397b13d..1b873bf59 100644
--- a/idp-parent/pom.xml
+++ b/idp-parent/pom.xml
@@ -48,7 +48,6 @@
<module>../idp-war-distribution</module>
<module>../idp-cli</module>
<module>../idp-installer</module>
- <module>../idp-conf</module>
<module>../idp-conf-impl</module>
<module>../idp-distribution</module>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list