[java-idp-jetty-base] 06/09: IDP-2297 Explore extending the Plugin and Module Infrastructure to allow Jetty installation
Rod Widdowson
rdw at steadingsoftware.com
Sat Aug 10 15:04:34 UTC 2024
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/IDP-2297
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=be37cc674381fb143c307d2cd0de1dba84b8d252
commit be37cc674381fb143c307d2cd0de1dba84b8d252
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 30 20:00:00 2024 +0100
IDP-2297 Explore extending the Plugin and Module Infrastructure to allow Jetty installation
https://shibboleth.atlassian.net/browse/IDP-2297
Do some renaming
---
jetty-base-dist/pom.xml | 2 +-
jetty-base-dist/src/main/assembly/plugin.xml | 2 +-
jetty-base-impl/pom.xml | 4 ++--
.../plugin => plugin/jettybase}/JettyBaseModule.java | 2 +-
.../plugin => plugin/jettybase}/JettyBasePlugin.java | 2 +-
.../{jettybase/plugin => plugin/jettybase}/Version.java | 2 +-
.../plugin => plugin/jettybase}/package-info.java | 2 +-
.../META-INF/services/net.shibboleth.idp.module.IdPModule | 2 +-
.../META-INF/services/net.shibboleth.idp.plugin.IdPPlugin | 2 +-
.../plugin => plugin/jettybase}/module.properties | 15 +++++++--------
.../jettybase/module/etc/jetty-requestlog.xml | 0
.../idp/{ => plugin}/jettybase/module/modules/idp.mod | 0
.../{ => plugin}/jettybase/module/resources/logback.xml | 0
.../idp/{ => plugin}/jettybase/module/start.d/custom.ini | 0
.../idp/{ => plugin}/jettybase/module/start.d/idp.ini | 0
.../idp/{ => plugin}/jettybase/module/webapps/idp.xml | 0
.../idp/{ => plugin}/jettybase/module/webapps/static.xml | 0
.../plugin => plugin/jettybase}/plugin.properties | 0
jetty-base-packages/pom.xml | 2 +-
19 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/jetty-base-dist/pom.xml b/jetty-base-dist/pom.xml
index c24f1cd..ba74214 100644
--- a/jetty-base-dist/pom.xml
+++ b/jetty-base-dist/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>net.shibboleth.idp.plugin.jetty-base</groupId>
- <artifactId>jetty-base-parent</artifactId>
+ <artifactId>jetty-base-plugin-parent</artifactId>
<version>12.0.11-SNAPSHOT</version>
</parent>
diff --git a/jetty-base-dist/src/main/assembly/plugin.xml b/jetty-base-dist/src/main/assembly/plugin.xml
index 40a3811..4232fc3 100644
--- a/jetty-base-dist/src/main/assembly/plugin.xml
+++ b/jetty-base-dist/src/main/assembly/plugin.xml
@@ -27,7 +27,7 @@
</fileSet>
<fileSet>
<!-- The properties file -->
- <directory>../jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/plugin/</directory>
+ <directory>../jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/</directory>
<outputDirectory>bootstrap</outputDirectory>
<includes>
<include>plugin.properties</include>
diff --git a/jetty-base-impl/pom.xml b/jetty-base-impl/pom.xml
index 91a520a..8b693c2 100644
--- a/jetty-base-impl/pom.xml
+++ b/jetty-base-impl/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>net.shibboleth.idp.plugin.jetty-base</groupId>
- <artifactId>jetty-base-parent</artifactId>
+ <artifactId>jetty-base-plugin-parent</artifactId>
<version>12.0.11-SNAPSHOT</version>
</parent>
@@ -45,7 +45,7 @@
<archive>
<manifestSections>
<manifestSection>
- <name>net/shibboleth/idp/plugin/jetty-base</name>
+ <name>net/shibboleth/idp/jettybase/plugin</name>
<manifestEntries>
<Implementation-Title>${project.artifactId}</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/JettyBaseModule.java b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBaseModule.java
similarity index 98%
rename from jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/JettyBaseModule.java
rename to jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBaseModule.java
index bbd671b..e15dd91 100644
--- a/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/JettyBaseModule.java
+++ b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBaseModule.java
@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.shibboleth.idp.jettybase.plugin;
+package net.shibboleth.idp.plugin.jettybase;
import java.io.IOException;
import java.nio.file.Files;
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/JettyBasePlugin.java b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBasePlugin.java
similarity index 97%
rename from jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/JettyBasePlugin.java
rename to jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBasePlugin.java
index dd340f3..b7cd38b 100644
--- a/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/JettyBasePlugin.java
+++ b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyBasePlugin.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.jettybase.plugin;
+package net.shibboleth.idp.plugin.jettybase;
import java.io.IOException;
import java.util.Set;
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/Version.java b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/Version.java
similarity index 96%
rename from jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/Version.java
rename to jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/Version.java
index fdc1813..5f5c3de 100644
--- a/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/Version.java
+++ b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/Version.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.jettybase.plugin;
+package net.shibboleth.idp.plugin.jettybase;
import javax.annotation.Nullable;
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/package-info.java b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java
similarity index 93%
rename from jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/package-info.java
rename to jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java
index 98d95de..5d3d849 100644
--- a/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/package-info.java
+++ b/jetty-base-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java
@@ -14,4 +14,4 @@
/** Classes for working with JSR-223 scripting environments. */
-package net.shibboleth.idp.jettybase.plugin;
+package net.shibboleth.idp.plugin.jettybase;
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 6fc30c3..9b59bed 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.jettybase.plugin.JettyBaseModule
\ No newline at end of file
+net.shibboleth.idp.plugin.jettybase.JettyBaseModule
\ 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 e7a1fd7..8284b41 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.jettybase.plugin.JettyBasePlugin
\ No newline at end of file
+net.shibboleth.idp.plugin.jettybase.JettyBasePlugin
\ No newline at end of file
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/plugin/module.properties b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
similarity index 53%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/plugin/module.properties
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
index 9b944be..442becd 100644
--- a/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/plugin/module.properties
+++ b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
@@ -9,24 +9,23 @@ jetty.base.plugin = net.shibboleth.idp.plugin.jettybase
jetty.base.module.name = Jetty Base Module
jetty.base.module.desc = Configures jetty
-
-jetty.base.module.1.src = /net/shibboleth/idp/jettybase/module/etc/jetty-requestlog.xml
+jetty.base.module.1.src = /net/shibboleth/idp/plugin/jettybase/module/etc/jetty-requestlog.xml
jetty.base.module.1.dest = jetty-base/etc/jetty-requestlog.xml
-jetty.base.module.2.src = /net/shibboleth/idp/jettybase/module/modules/idp.mod
+jetty.base.module.2.src = /net/shibboleth/idp/plugin/jettybase/module/modules/idp.mod
jetty.base.module.2.dest = jetty-base/modules/idp.mod
-jetty.base.module.3.src = /net/shibboleth/idp/jettybase/module/resources/logback.xml
+jetty.base.module.3.src = /net/shibboleth/idp/plugin/jettybase/module/resources/logback.xml
jetty.base.module.3.dest = jetty-base/resources/logback.xml
-jetty.base.module.4.src = /net/shibboleth/idp/jettybase/module/start.d/custom.ini
+jetty.base.module.4.src = /net/shibboleth/idp/plugin/jettybase/module/start.d/custom.ini
jetty.base.module.4.dest = jetty-base/start.d/custom.ini
-jetty.base.module.5.src = /net/shibboleth/idp/jettybase/module/start.d/idp.ini
+jetty.base.module.5.src = /net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini
jetty.base.module.5.dest = jetty-base/start.d/idp.ini
-jetty.base.module.6.src = /net/shibboleth/idp/jettybase/module/webapps/idp.xml
+jetty.base.module.6.src = /net/shibboleth/idp/plugin/jettybase/module/webapps/idp.xml
jetty.base.module.6.dest = jetty-base/webapps/idp.xml
-jetty.base.module.7.src = /net/shibboleth/idp/jettybase/module/webapps/static.xml
+jetty.base.module.7.src = /net/shibboleth/idp/plugin/jettybase/module/webapps/static.xml
jetty.base.module.7.dest = jetty-base/webapps/static.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/etc/jetty-requestlog.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/etc/jetty-requestlog.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/etc/jetty-requestlog.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/etc/jetty-requestlog.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/modules/idp.mod b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/modules/idp.mod
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/modules/idp.mod
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/modules/idp.mod
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/resources/logback.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/resources/logback.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/resources/logback.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/resources/logback.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/start.d/custom.ini b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/custom.ini
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/start.d/custom.ini
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/custom.ini
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/start.d/idp.ini b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/start.d/idp.ini
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/webapps/idp.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/webapps/idp.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/webapps/idp.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/webapps/idp.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/webapps/static.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/webapps/static.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/webapps/static.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/webapps/static.xml
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/plugin/plugin.properties b/jetty-base-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/jettybase/plugin/plugin.properties
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/plugin.properties
diff --git a/jetty-base-packages/pom.xml b/jetty-base-packages/pom.xml
index d01e0a5..c18c46c 100644
--- a/jetty-base-packages/pom.xml
+++ b/jetty-base-packages/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>net.shibboleth.idp.plugin.jetty-base</groupId>
- <artifactId>jetty-base-parent</artifactId>
+ <artifactId>jetty-base-plugin-parent</artifactId>
<version>12.0.11-SNAPSHOT</version>
</parent>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list