[java-idp-jetty-base] 01/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:29 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=328ecf39d07c8b9f54a184dc602c6c34fa01f00b
commit 328ecf39d07c8b9f54a184dc602c6c34fa01f00b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jul 26 13:26:44 2024 +0100
IDP-2297 Explore extending the Plugin and Module Infrastructure to allow Jetty installation
https://shibboleth.atlassian.net/browse/IDP-2297
Start to move towards being a plugin
---
.gitignore | 2 +-
{doc => jetty-base-impl/doc}/LICENSE.txt | 0
jetty-base-impl/pom.xml | 56 ++++++++
.../src}/main/assembly/testbed.xml | 0
{src => jetty-base-impl/src}/main/assembly/tgz.xml | 0
{src => jetty-base-impl/src}/main/assembly/zip.xml | 0
.../src}/main/resources/.gitkeep | 0
.../main/resources/jetty-base/credentials/.gitkeep | 0
.../resources/jetty-base/etc/idp-backchannel.xml | 0
.../resources/jetty-base/etc/jetty-requestlog.xml | 0
.../lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar | Bin
.../src}/main/resources/jetty-base/logs/.gitkeep | 0
.../src}/main/resources/jetty-base/modules/idp.mod | 0
.../resources/jetty-base/resources/logback.xml | 0
.../main/resources/jetty-base/start.d/custom.ini | 0
.../src}/main/resources/jetty-base/start.d/idp.ini | 0
.../src}/main/resources/jetty-base/static/.gitkeep | 0
.../src}/main/resources/jetty-base/tmp/.gitkeep | 0
.../src}/main/resources/jetty-base/webapps/idp.xml | 0
.../main/resources/jetty-base/webapps/static.xml | 0
{src => jetty-base-impl/src}/site/site.xml | 0
.../test/resources/jetty-base/etc/idp-testbed.xml | 0
.../test/resources/jetty-base/etc/web-override.xml | 0
.../resources/jetty-base/modules/idp-testbed.mod | 0
.../src}/test/resources/jetty-base/webapps/idp.xml | 0
pom.xml | 155 ++++++---------------
26 files changed, 97 insertions(+), 116 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0056eeb..b9f7170 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@
.*.swp
.DS_store
# Simulated Subversion default ignores end here
-/target
+*/target
/test-output
.settings
.classpath
diff --git a/doc/LICENSE.txt b/jetty-base-impl/doc/LICENSE.txt
similarity index 100%
rename from doc/LICENSE.txt
rename to jetty-base-impl/doc/LICENSE.txt
diff --git a/jetty-base-impl/pom.xml b/jetty-base-impl/pom.xml
new file mode 100644
index 0000000..15d7422
--- /dev/null
+++ b/jetty-base-impl/pom.xml
@@ -0,0 +1,56 @@
+<?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.plugin.jetty-base</groupId>
+ <artifactId>jetty-base-parent</artifactId>
+ <version>12.0.11-SNAPSHOT</version>
+ </parent>
+
+ <name>Jettty Base: Plugin and Module implementation </name>
+ <artifactId>jetty-base-plugin-impl</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <!-- Provided Dependencies needed to build the plugin and module -->
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-admin-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestSections>
+ <manifestSection>
+ <name>net/shibboleth/idp/plugin/jetty-base</name>
+ <manifestEntries>
+ <Implementation-Title>${project.artifactId}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/src/main/assembly/testbed.xml b/jetty-base-impl/src/main/assembly/testbed.xml
similarity index 100%
rename from src/main/assembly/testbed.xml
rename to jetty-base-impl/src/main/assembly/testbed.xml
diff --git a/src/main/assembly/tgz.xml b/jetty-base-impl/src/main/assembly/tgz.xml
similarity index 100%
rename from src/main/assembly/tgz.xml
rename to jetty-base-impl/src/main/assembly/tgz.xml
diff --git a/src/main/assembly/zip.xml b/jetty-base-impl/src/main/assembly/zip.xml
similarity index 100%
rename from src/main/assembly/zip.xml
rename to jetty-base-impl/src/main/assembly/zip.xml
diff --git a/src/main/resources/.gitkeep b/jetty-base-impl/src/main/resources/.gitkeep
similarity index 100%
rename from src/main/resources/.gitkeep
rename to jetty-base-impl/src/main/resources/.gitkeep
diff --git a/src/main/resources/jetty-base/credentials/.gitkeep b/jetty-base-impl/src/main/resources/jetty-base/credentials/.gitkeep
similarity index 100%
rename from src/main/resources/jetty-base/credentials/.gitkeep
rename to jetty-base-impl/src/main/resources/jetty-base/credentials/.gitkeep
diff --git a/src/main/resources/jetty-base/etc/idp-backchannel.xml b/jetty-base-impl/src/main/resources/jetty-base/etc/idp-backchannel.xml
similarity index 100%
rename from src/main/resources/jetty-base/etc/idp-backchannel.xml
rename to jetty-base-impl/src/main/resources/jetty-base/etc/idp-backchannel.xml
diff --git a/src/main/resources/jetty-base/etc/jetty-requestlog.xml b/jetty-base-impl/src/main/resources/jetty-base/etc/jetty-requestlog.xml
similarity index 100%
rename from src/main/resources/jetty-base/etc/jetty-requestlog.xml
rename to jetty-base-impl/src/main/resources/jetty-base/etc/jetty-requestlog.xml
diff --git a/src/main/resources/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar b/jetty-base-impl/src/main/resources/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar
similarity index 100%
rename from src/main/resources/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar
rename to jetty-base-impl/src/main/resources/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar
diff --git a/src/main/resources/jetty-base/logs/.gitkeep b/jetty-base-impl/src/main/resources/jetty-base/logs/.gitkeep
similarity index 100%
rename from src/main/resources/jetty-base/logs/.gitkeep
rename to jetty-base-impl/src/main/resources/jetty-base/logs/.gitkeep
diff --git a/src/main/resources/jetty-base/modules/idp.mod b/jetty-base-impl/src/main/resources/jetty-base/modules/idp.mod
similarity index 100%
rename from src/main/resources/jetty-base/modules/idp.mod
rename to jetty-base-impl/src/main/resources/jetty-base/modules/idp.mod
diff --git a/src/main/resources/jetty-base/resources/logback.xml b/jetty-base-impl/src/main/resources/jetty-base/resources/logback.xml
similarity index 100%
rename from src/main/resources/jetty-base/resources/logback.xml
rename to jetty-base-impl/src/main/resources/jetty-base/resources/logback.xml
diff --git a/src/main/resources/jetty-base/start.d/custom.ini b/jetty-base-impl/src/main/resources/jetty-base/start.d/custom.ini
similarity index 100%
rename from src/main/resources/jetty-base/start.d/custom.ini
rename to jetty-base-impl/src/main/resources/jetty-base/start.d/custom.ini
diff --git a/src/main/resources/jetty-base/start.d/idp.ini b/jetty-base-impl/src/main/resources/jetty-base/start.d/idp.ini
similarity index 100%
rename from src/main/resources/jetty-base/start.d/idp.ini
rename to jetty-base-impl/src/main/resources/jetty-base/start.d/idp.ini
diff --git a/src/main/resources/jetty-base/static/.gitkeep b/jetty-base-impl/src/main/resources/jetty-base/static/.gitkeep
similarity index 100%
rename from src/main/resources/jetty-base/static/.gitkeep
rename to jetty-base-impl/src/main/resources/jetty-base/static/.gitkeep
diff --git a/src/main/resources/jetty-base/tmp/.gitkeep b/jetty-base-impl/src/main/resources/jetty-base/tmp/.gitkeep
similarity index 100%
rename from src/main/resources/jetty-base/tmp/.gitkeep
rename to jetty-base-impl/src/main/resources/jetty-base/tmp/.gitkeep
diff --git a/src/main/resources/jetty-base/webapps/idp.xml b/jetty-base-impl/src/main/resources/jetty-base/webapps/idp.xml
similarity index 100%
rename from src/main/resources/jetty-base/webapps/idp.xml
rename to jetty-base-impl/src/main/resources/jetty-base/webapps/idp.xml
diff --git a/src/main/resources/jetty-base/webapps/static.xml b/jetty-base-impl/src/main/resources/jetty-base/webapps/static.xml
similarity index 100%
rename from src/main/resources/jetty-base/webapps/static.xml
rename to jetty-base-impl/src/main/resources/jetty-base/webapps/static.xml
diff --git a/src/site/site.xml b/jetty-base-impl/src/site/site.xml
similarity index 100%
rename from src/site/site.xml
rename to jetty-base-impl/src/site/site.xml
diff --git a/src/test/resources/jetty-base/etc/idp-testbed.xml b/jetty-base-impl/src/test/resources/jetty-base/etc/idp-testbed.xml
similarity index 100%
rename from src/test/resources/jetty-base/etc/idp-testbed.xml
rename to jetty-base-impl/src/test/resources/jetty-base/etc/idp-testbed.xml
diff --git a/src/test/resources/jetty-base/etc/web-override.xml b/jetty-base-impl/src/test/resources/jetty-base/etc/web-override.xml
similarity index 100%
rename from src/test/resources/jetty-base/etc/web-override.xml
rename to jetty-base-impl/src/test/resources/jetty-base/etc/web-override.xml
diff --git a/src/test/resources/jetty-base/modules/idp-testbed.mod b/jetty-base-impl/src/test/resources/jetty-base/modules/idp-testbed.mod
similarity index 100%
rename from src/test/resources/jetty-base/modules/idp-testbed.mod
rename to jetty-base-impl/src/test/resources/jetty-base/modules/idp-testbed.mod
diff --git a/src/test/resources/jetty-base/webapps/idp.xml b/jetty-base-impl/src/test/resources/jetty-base/webapps/idp.xml
similarity index 100%
rename from src/test/resources/jetty-base/webapps/idp.xml
rename to jetty-base-impl/src/test/resources/jetty-base/webapps/idp.xml
diff --git a/pom.xml b/pom.xml
index 4e2b3a9..efebe5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,130 +10,55 @@
<version>17.2.0-SNAPSHOT</version>
</parent>
- <name>idp-jetty-base</name>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-jetty-base</artifactId>
+ <name>Jetty base plugin Parent Project</name>
+ <groupId>net.shibboleth.idp.plugin.jetty-base</groupId>
+ <artifactId>jetty-base-parent</artifactId>
<packaging>pom</packaging>
- <version>12.0.0-SNAPSHOT</version>
+ <version>12.0.11-SNAPSHOT</version>
<properties>
- <assemblyDirectory>${project.build.directory}/idp-jetty-base</assemblyDirectory>
+ <idp.groupId>net.shibboleth.idp</idp.groupId>
+ <idp.version>5.2.0-SNAPSHOT</idp.version>
+
+ <shib-profile.groupId>net.shibboleth</shib-profile.groupId>
+ <shib-profile.version>5.2.0-SNAPSHOT</shib-profile.version>
+
<logback.version>1.5.6</logback.version>
- </properties>
- <dependencies>
- <!-- Compile Dependencies -->
+ <procrun.groupId>commons-daemon</procrun.groupId>
+ <procrun.artifactId>commons-daemon</procrun.artifactId>
+ <procrun.version>1.3.4</procrun.version>
- <!-- Provided Dependencies -->
+ <procrun.classifier>bin-windows</procrun.classifier>
+ <jetty.version>12.0.11</jetty.version>
- <!-- Runtime Dependencies -->
+ </properties>
- <!-- Test Dependencies -->
+ <dependencies/>
- <!-- Managed Dependencies -->
- </dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Import Dependencies: Shib-Metadata/Attribute/Profile -->
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-bom</artifactId>
+ <version>${shib-profile.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!-- Import IdP -->
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-bom</artifactId>
+ <version>${idp.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <build>
- <plugins>
- <!-- Copy src/main/resources to assembly directory. -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <includeEmptyDirs>true</includeEmptyDirs>
- <outputDirectory>${assemblyDirectory}</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <excludes>
- <exclude>**/.gitkeep</exclude>
- </excludes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- <!-- Copy src/test/resources to assembly-testbed directory. -->
- <!-- Don't build the testbed this way, yet ...
- <execution>
- <id>copy-testbed-resources</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${assemblyDirectory}-testbed</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/test/resources</directory>
- <excludes>
- <exclude>**/.gitkeep</exclude>
- </excludes>
- </resource>
- </resources>
- </configuration>
- </execution>
- -->
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <!-- Copy Logback logging dependencies to jetty-base/lib/logging directory. -->
- <execution>
- <id>copy-jetty-logging-logback</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${assemblyDirectory}/jetty-base/lib/logging/</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Assemble the artifacts. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/tgz.xml</descriptor>
- <descriptor>src/main/assembly/zip.xml</descriptor>
- <!-- <descriptor>src/main/assembly/testbed.xml</descriptor> -->
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modules>
+ <module>jetty-base-impl</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