[java-idp-jetty-base] 04/05: JJETTY1 Rationalize Module/Plugin names
Rod Widdowson
rdw at steadingsoftware.com
Fri Oct 25 12:35:24 UTC 2024
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch 12
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=58891ba4455060a24cd53c7b05aed0f05a0fa0b1
commit 58891ba4455060a24cd53c7b05aed0f05a0fa0b1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Oct 24 14:20:52 2024 +0100
JJETTY1 Rationalize Module/Plugin names
https://shibboleth.atlassian.net/browse/JJETTY-1
Remove '-base' from the directories
---
{jetty-base-dist => jetty-dist}/.check-m2 | 0
{jetty-base-dist => jetty-dist}/pom.xml | 0
.../src/main/assembly/plugin.xml | 8 ++++----
.../src/main/enforcer/shibbolethKeys.gpg | Bin
.../src/main/resources/bootstrap/keys.txt | 0
{jetty-base-impl => jetty-impl}/doc/LICENSE.txt | 0
{jetty-base-impl => jetty-impl}/pom.xml | 0
{jetty-base-impl => jetty-impl}/src/main/assembly/tgz.xml | 0
{jetty-base-impl => jetty-impl}/src/main/assembly/zip.xml | 0
.../net/shibboleth/idp/plugin/jettybase/JettyModule.java | 0
.../net/shibboleth/idp/plugin/jettybase/JettyPlugin.java | 0
.../java/net/shibboleth/idp/plugin/jettybase/Version.java | 0
.../net/shibboleth/idp/plugin/jettybase/package-info.java | 0
{jetty-base-impl => jetty-impl}/src/main/resources/.gitkeep | 0
.../META-INF/services/net.shibboleth.idp.module.IdPModule | 0
.../META-INF/services/net.shibboleth.idp.plugin.IdPPlugin | 0
.../net/shibboleth/idp/plugin/jettybase/module.properties | 0
.../shibboleth/idp/plugin/jettybase/module/config-jetty.bat | 0
.../module/jetty-base-windows/start.d/idp-system.ini | 0
.../module/jetty-base-windows/start.d/idp.ini-windows | 0
.../plugin/jettybase/module/jetty-base/credentials/.gitkeep | 0
.../jettybase/module/jetty-base/etc/idp-backchannel.xml | 0
.../jettybase/module/jetty-base/etc/jetty-requestlog.xml | 0
.../lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar | Bin
.../idp/plugin/jettybase/module/jetty-base/logs/.gitkeep | 0
.../idp/plugin/jettybase/module/jetty-base/modules/idp.mod | 0
.../jettybase/module/jetty-base/resources/logback.xml | 0
.../plugin/jettybase/module/jetty-base/start.d/custom.ini | 0
.../idp/plugin/jettybase/module/jetty-base/start.d/idp.ini | 0
.../plugin/jettybase/module/jetty-base/static/index.html | 0
.../idp/plugin/jettybase/module/jetty-base/tmp/.gitkeep | 0
.../idp/plugin/jettybase/module/jetty-base/webapps/idp.xml | 0
.../plugin/jettybase/module/jetty-base/webapps/static.xml | 0
.../net/shibboleth/idp/plugin/jettybase/module/runjetty.bat | 0
.../net/shibboleth/idp/plugin/jettybase/module/runjetty.sh | 0
.../net/shibboleth/idp/plugin/jettybase/plugin.properties | 0
{jetty-base-packages => jetty-packages}/pom.xml | 0
.../src/main/assembly/logback.xml | 0
pom.xml | 6 +++---
39 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/jetty-base-dist/.check-m2 b/jetty-dist/.check-m2
similarity index 100%
rename from jetty-base-dist/.check-m2
rename to jetty-dist/.check-m2
diff --git a/jetty-base-dist/pom.xml b/jetty-dist/pom.xml
similarity index 100%
rename from jetty-base-dist/pom.xml
rename to jetty-dist/pom.xml
diff --git a/jetty-base-dist/src/main/assembly/plugin.xml b/jetty-dist/src/main/assembly/plugin.xml
similarity index 82%
rename from jetty-base-dist/src/main/assembly/plugin.xml
rename to jetty-dist/src/main/assembly/plugin.xml
index 4232fc3..6211e7a 100644
--- a/jetty-base-dist/src/main/assembly/plugin.xml
+++ b/jetty-dist/src/main/assembly/plugin.xml
@@ -6,10 +6,10 @@
<fileSets>
<fileSet>
<!-- Our plugin and module impl -->
- <directory>../jetty-base-impl/target</directory>
+ <directory>../jetty-impl/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
- <include>jetty-base-plugin-*.jar</include>
+ <include>jetty-plugin-*.jar</include>
</includes><!--
<excludes>
<exclude>*test*.jar</exclude>
@@ -27,7 +27,7 @@
</fileSet>
<fileSet>
<!-- The properties file -->
- <directory>../jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/</directory>
+ <directory>../jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/</directory>
<outputDirectory>bootstrap</outputDirectory>
<includes>
<include>plugin.properties</include>
@@ -35,7 +35,7 @@
</fileSet>
<fileSet>
<!-- The packages -->
- <directory>../jetty-base-packages/target/packages</directory>
+ <directory>../jetty-packages/target/packages</directory>
<outputDirectory>packages</outputDirectory>
<includes>
<include>logback.tar.gz</include>
diff --git a/jetty-base-dist/src/main/enforcer/shibbolethKeys.gpg b/jetty-dist/src/main/enforcer/shibbolethKeys.gpg
similarity index 100%
rename from jetty-base-dist/src/main/enforcer/shibbolethKeys.gpg
rename to jetty-dist/src/main/enforcer/shibbolethKeys.gpg
diff --git a/jetty-base-dist/src/main/resources/bootstrap/keys.txt b/jetty-dist/src/main/resources/bootstrap/keys.txt
similarity index 100%
rename from jetty-base-dist/src/main/resources/bootstrap/keys.txt
rename to jetty-dist/src/main/resources/bootstrap/keys.txt
diff --git a/jetty-base-impl/doc/LICENSE.txt b/jetty-impl/doc/LICENSE.txt
similarity index 100%
rename from jetty-base-impl/doc/LICENSE.txt
rename to jetty-impl/doc/LICENSE.txt
diff --git a/jetty-base-impl/pom.xml b/jetty-impl/pom.xml
similarity index 100%
rename from jetty-base-impl/pom.xml
rename to jetty-impl/pom.xml
diff --git a/jetty-base-impl/src/main/assembly/tgz.xml b/jetty-impl/src/main/assembly/tgz.xml
similarity index 100%
rename from jetty-base-impl/src/main/assembly/tgz.xml
rename to jetty-impl/src/main/assembly/tgz.xml
diff --git a/jetty-base-impl/src/main/assembly/zip.xml b/jetty-impl/src/main/assembly/zip.xml
similarity index 100%
rename from jetty-base-impl/src/main/assembly/zip.xml
rename to jetty-impl/src/main/assembly/zip.xml
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyModule.java b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyModule.java
similarity index 100%
rename from jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyModule.java
rename to jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyModule.java
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyPlugin.java b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyPlugin.java
similarity index 100%
rename from jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyPlugin.java
rename to jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyPlugin.java
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/Version.java b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/Version.java
similarity index 100%
rename from jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/Version.java
rename to jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/Version.java
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java
similarity index 100%
rename from jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java
rename to jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java
diff --git a/jetty-base-impl/src/main/resources/.gitkeep b/jetty-impl/src/main/resources/.gitkeep
similarity index 100%
rename from jetty-base-impl/src/main/resources/.gitkeep
rename to jetty-impl/src/main/resources/.gitkeep
diff --git a/jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
similarity index 100%
rename from jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
rename to jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
diff --git a/jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin b/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
similarity index 100%
rename from jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
rename to jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/config-jetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/config-jetty.bat
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/config-jetty.bat
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/config-jetty.bat
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/credentials/.gitkeep b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/credentials/.gitkeep
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/credentials/.gitkeep
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/credentials/.gitkeep
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/idp-backchannel.xml b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/idp-backchannel.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/idp-backchannel.xml
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/idp-backchannel.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/logs/.gitkeep b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/logs/.gitkeep
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/logs/.gitkeep
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/logs/.gitkeep
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/modules/idp.mod b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/modules/idp.mod
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/modules/idp.mod
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/modules/idp.mod
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/resources/logback.xml b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/resources/logback.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/resources/logback.xml
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/resources/logback.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/custom.ini b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/custom.ini
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/custom.ini
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/custom.ini
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/static/index.html b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/static/index.html
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/static/index.html
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/static/index.html
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/tmp/.gitkeep b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/tmp/.gitkeep
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/tmp/.gitkeep
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/tmp/.gitkeep
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/idp.xml b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/idp.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/idp.xml
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/idp.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/static.xml b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/static.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/static.xml
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/static.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.bat
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.bat
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.bat
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.sh b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.sh
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.sh
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.sh
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/plugin.properties b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/plugin.properties
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/plugin.properties
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/plugin.properties
diff --git a/jetty-base-packages/pom.xml b/jetty-packages/pom.xml
similarity index 100%
rename from jetty-base-packages/pom.xml
rename to jetty-packages/pom.xml
diff --git a/jetty-base-packages/src/main/assembly/logback.xml b/jetty-packages/src/main/assembly/logback.xml
similarity index 100%
rename from jetty-base-packages/src/main/assembly/logback.xml
rename to jetty-packages/src/main/assembly/logback.xml
diff --git a/pom.xml b/pom.xml
index f0e0429..93edbd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,9 +67,9 @@
</dependencyManagement>
<modules>
- <module>jetty-base-packages</module>
- <module>jetty-base-impl</module>
- <module>jetty-base-dist</module>
+ <module>jetty-packages</module>
+ <module>jetty-impl</module>
+ <module>jetty-dist</module>
</modules>
</project>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list