[java-idp-jetty-base] 02/05: JJETTY1 Rationalize Module/Plugin names
Rod Widdowson
rdw at steadingsoftware.com
Fri Oct 25 12:35:22 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=1aabc66b25eecd670133e0ca5d0860a7170ed7b8
commit 1aabc66b25eecd670133e0ca5d0860a7170ed7b8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Oct 24 11:41:33 2024 +0100
JJETTY1 Rationalize Module/Plugin names
https://shibboleth.atlassian.net/browse/JJETTY-1
Rename the classes, module amd plugin IDs
---
jetty-base-dist/pom.xml | 2 +-
jetty-base-impl/pom.xml | 1 +
jetty-base-impl/src/main/assembly/testbed.xml | 22 ----
.../{JettyBaseModule.java => JettyModule.java} | 9 +-
.../{JettyBasePlugin.java => JettyPlugin.java} | 10 +-
.../services/net.shibboleth.idp.module.IdPModule | 2 +-
.../services/net.shibboleth.idp.plugin.IdPPlugin | 2 +-
.../idp/plugin/jettybase/module.properties | 124 ++++++++++-----------
.../idp/plugin/jettybase/plugin.properties | 2 +-
9 files changed, 76 insertions(+), 98 deletions(-)
diff --git a/jetty-base-dist/pom.xml b/jetty-base-dist/pom.xml
index 05feaab..6f6d25d 100644
--- a/jetty-base-dist/pom.xml
+++ b/jetty-base-dist/pom.xml
@@ -36,7 +36,7 @@
<descriptors>
<descriptor>src/main/assembly/plugin.xml</descriptor>
</descriptors>
- <finalName>shibboleth-idp-plugin-jetty-base-${project.version}</finalName>
+ <finalName>shibboleth-idp-plugin-jetty-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
diff --git a/jetty-base-impl/pom.xml b/jetty-base-impl/pom.xml
index 2b16644..222f094 100644
--- a/jetty-base-impl/pom.xml
+++ b/jetty-base-impl/pom.xml
@@ -135,6 +135,7 @@
<descriptor>src/main/assembly/zip.xml</descriptor>
<!-- <descriptor>src/main/assembly/testbed.xml</descriptor> -->
</descriptors>
+ <finalName>shibboleth-idp-jetty-base-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<executions>
diff --git a/jetty-base-impl/src/main/assembly/testbed.xml b/jetty-base-impl/src/main/assembly/testbed.xml
deleted file mode 100644
index 5b3687e..0000000
--- a/jetty-base-impl/src/main/assembly/testbed.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
- <id>testbed</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${assemblyDirectory}</directory>
- <excludes>
- <exclude>**/webapps/idp.xml</exclude>
- </excludes>
- <outputDirectory></outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${assemblyDirectory}-testbed</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
- <includeBaseDirectory>false</includeBaseDirectory>
-</assembly>
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBaseModule.java b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyModule.java
similarity index 92%
rename from jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBaseModule.java
rename to jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyModule.java
index 12c63f7..3898d96 100644
--- a/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBaseModule.java
+++ b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyModule.java
@@ -26,7 +26,6 @@ import org.apache.commons.lang3.SystemUtils;
import org.slf4j.Logger;
import net.shibboleth.idp.Version;
-import net.shibboleth.idp.installer.InstallerSupport;
import net.shibboleth.idp.installer.InstallerProperties;
import net.shibboleth.idp.module.impl.PluginIdPModule;
import net.shibboleth.profile.module.ModuleContext;
@@ -35,16 +34,16 @@ import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.security.impl.SelfSignedCertificateGenerator;
-public class JettyBaseModule extends PluginIdPModule {
+public class JettyModule extends PluginIdPModule {
/** Class logger. */
- @Nonnull private Logger log = LoggerFactory.getLogger(JettyBaseModule.class);
+ @Nonnull private Logger log = LoggerFactory.getLogger(JettyModule.class);
/**
* Constructor.
*/
- public JettyBaseModule() throws IOException, ModuleException {
- super(Version.getVersion(), JettyBaseModule.class);
+ public JettyModule() throws IOException, ModuleException {
+ super(Version.getVersion(), JettyModule.class);
}
/** {@inheritDoc} */
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBasePlugin.java b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyPlugin.java
similarity index 85%
rename from jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBasePlugin.java
rename to jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyPlugin.java
index b7cd38b..0791dfe 100644
--- a/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBasePlugin.java
+++ b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyPlugin.java
@@ -23,16 +23,16 @@ import net.shibboleth.profile.module.ModuleException;
import net.shibboleth.profile.plugin.PluginException;
import net.shibboleth.shared.collection.CollectionSupport;
-/**Details about the Nashorn scripting plugin. */
-public class JettyBasePlugin extends FirstPartyIdPPlugin {
+/**Details about the Jetty plugin. */
+public class JettyPlugin extends FirstPartyIdPPlugin {
/** Constructor.
* @throws PluginException from {@link FirstPartyIdPPlugin}
* @throws IOException from {@link FirstPartyIdPPlugin}
*/
- public JettyBasePlugin() throws PluginException, IOException {
- super(JettyBasePlugin.class);
+ public JettyPlugin() throws PluginException, IOException {
+ super(JettyPlugin.class);
try {
- final Set<IdPModule> modules = CollectionSupport.singleton(new JettyBaseModule());
+ final Set<IdPModule> modules = CollectionSupport.singleton(new JettyModule());
setEnableOnInstall(modules);
setDisableOnRemoval(modules);
} catch (final IOException e) {
diff --git a/jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
index 9b59bed..d063152 100644
--- a/jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ b/jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -1 +1 @@
-net.shibboleth.idp.plugin.jettybase.JettyBaseModule
\ No newline at end of file
+net.shibboleth.idp.plugin.jettybase.JettyModule
\ No newline at end of file
diff --git a/jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin b/jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
index 8284b41..cc1d497 100644
--- a/jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
+++ b/jetty-base-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
@@ -1 +1 @@
-net.shibboleth.idp.plugin.jettybase.JettyBasePlugin
\ No newline at end of file
+net.shibboleth.idp.plugin.jettybase.JettyPlugin
\ No newline at end of file
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
index bde6a22..6c0b6ab 100644
--- a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
+++ b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
@@ -1,80 +1,80 @@
# Properties defining this module.
# Class to Module ID mappings
-net.shibboleth.idp.plugin.jettybase.JettyBaseModule = jetty.base.module
+net.shibboleth.idp.plugin.jettybase.JettyModule = jetty.module
# Module Owner
-jetty.base.plugin = net.shibboleth.idp.plugin.jetty-base
+jetty.plugin = net.shibboleth.idp.plugin.jetty-base
-jetty.base.module.name = Jetty Base Module
-jetty.base.module.desc = Configures jetty
+jetty.module.name = Jetty Base Module
+jetty.module.desc = Configures jetty
-jetty.base.module.1.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml
-jetty.base.module.1.dest = jetty-base/etc/jetty-requestlog.xml
+jetty.module.1.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml
+jetty.module.1.dest = jetty-base/etc/jetty-requestlog.xml
-jetty.base.module.2.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/modules/idp.mod
-jetty.base.module.2.dest = jetty-base/modules/idp.mod
+jetty.module.2.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/modules/idp.mod
+jetty.module.2.dest = jetty-base/modules/idp.mod
-jetty.base.module.3.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/resources/logback.xml
-jetty.base.module.3.dest = jetty-base/resources/logback.xml
+jetty.module.3.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/resources/logback.xml
+jetty.module.3.dest = jetty-base/resources/logback.xml
-jetty.base.module.4.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/idp.xml
-jetty.base.module.4.dest = jetty-base/webapps/idp.xml
+jetty.module.4.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/idp.xml
+jetty.module.4.dest = jetty-base/webapps/idp.xml
-jetty.base.module.5.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/static.xml
-jetty.base.module.5.dest = jetty-base/webapps/static.xml
+jetty.module.5.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/static.xml
+jetty.module.5.dest = jetty-base/webapps/static.xml
-jetty.base.module.6.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/static/index.html
-jetty.base.module.6.dest = jetty-base/static/index.html
+jetty.module.6.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/static/index.html
+jetty.module.6.dest = jetty-base/static/index.html
# For legacy reasons we separate Windows and non windows start.d
-jetty.base.module.7.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/custom.ini
-jetty.base.module.7.dest = jetty-base/start.d/custom.ini
-jetty.base.module.7.nonwindows = true
-jetty.base.module.7.windows = false
-jetty.base.module.7.replace = false
-
-jetty.base.module.8.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
-jetty.base.module.8.dest = jetty-base/start.d/idp.ini
-jetty.base.module.8.nonwindows = true
-jetty.base.module.8.windows = false
-jetty.base.module.8.replace = false
-
-jetty.base.module.9.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
-jetty.base.module.9.dest = jetty-base/start.d/idp.ini-unix
-jetty.base.module.9.nonwindows = false
-jetty.base.module.9.windows = true
-jetty.base.module.9.replace = false
-
-
-jetty.base.module.10.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini
-jetty.base.module.10.dest = jetty-base/start.d/idp-system.ini
-jetty.base.module.10.nonwindows = false
-jetty.base.module.10.windows = true
-jetty.base.module.10.replace = true
-
-jetty.base.module.11.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows
-jetty.base.module.11.dest = jetty-base/start.d/idp.ini
-jetty.base.module.11.nonwindows = false
-jetty.base.module.11.windows = true
-jetty.base.module.11.replace = false
-
-jetty.base.module.12.src = /net/shibboleth/idp/plugin/jettybase/module/runjetty.bat
-jetty.base.module.12.dest = bin/runjetty.bat
-jetty.base.module.12.nonwindows = false
-jetty.base.module.12.windows = true
-
-jetty.base.module.13.src = /net/shibboleth/idp/plugin/jettybase/module/runjetty.sh
-jetty.base.module.13.dest = bin/runjetty.sh
-jetty.base.module.13.nonwindows = true
-jetty.base.module.13.windows = false
-jetty.base.module.13.exec = true
-
-jetty.base.module.13.src = /net/shibboleth/idp/plugin/jettybase/module/config-jetty.bat
-jetty.base.module.13.dest = bin/config-jetty.bat
-jetty.base.module.13.nonwindows = false
-jetty.base.module.13.windows = true
+jetty.module.7.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/custom.ini
+jetty.module.7.dest = jetty-base/start.d/custom.ini
+jetty.module.7.nonwindows = true
+jetty.module.7.windows = false
+jetty.module.7.replace = false
+
+jetty.module.8.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
+jetty.module.8.dest = jetty-base/start.d/idp.ini
+jetty.module.8.nonwindows = true
+jetty.module.8.windows = false
+jetty.module.8.replace = false
+
+jetty.module.9.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
+jetty.module.9.dest = jetty-base/start.d/idp.ini-unix
+jetty.module.9.nonwindows = false
+jetty.module.9.windows = true
+jetty.module.9.replace = false
+
+
+jetty.module.10.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini
+jetty.module.10.dest = jetty-base/start.d/idp-system.ini
+jetty.module.10.nonwindows = false
+jetty.module.10.windows = true
+jetty.module.10.replace = true
+
+jetty.module.11.src = /net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows
+jetty.module.11.dest = jetty-base/start.d/idp.ini
+jetty.module.11.nonwindows = false
+jetty.module.11.windows = true
+jetty.module.11.replace = false
+
+jetty.module.12.src = /net/shibboleth/idp/plugin/jettybase/module/runjetty.bat
+jetty.module.12.dest = bin/runjetty.bat
+jetty.module.12.nonwindows = false
+jetty.module.12.windows = true
+
+jetty.module.13.src = /net/shibboleth/idp/plugin/jettybase/module/runjetty.sh
+jetty.module.13.dest = bin/runjetty.sh
+jetty.module.13.nonwindows = true
+jetty.module.13.windows = false
+jetty.module.13.exec = true
+
+jetty.module.13.src = /net/shibboleth/idp/plugin/jettybase/module/config-jetty.bat
+jetty.module.13.dest = bin/config-jetty.bat
+jetty.module.13.nonwindows = false
+jetty.module.13.windows = true
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/plugin.properties b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/plugin.properties
index 838a434..e7b01ef 100644
--- a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/plugin.properties
+++ b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/plugin.properties
@@ -1,6 +1,6 @@
# Properties defining this plugin
-plugin.id = net.shibboleth.idp.plugin.jetty-base
+plugin.id = net.shibboleth.idp.plugin.jetty
# Only used when package manifest is not available
plugin.version = 5.12014.0
plugin.license =
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list